fix: fix issue #23 broken css for link insert

.credo.exs

@@ -0,0 +1,53 @@
+%{
+  configs: [
+    %{
+      name: "default",
+      files: %{
+        included: ["lib/", "test/", "config/", "mix.exs"],
+        excluded: [~r"/deps/", ~r"/_build/", ~r"/priv/static/"]
+      },
+      strict: true,
+      parse_timeout: 10_000,
+      color: true,
+      checks: [
+        {Credo.Check.Consistency.ExceptionNames},
+        {Credo.Check.Consistency.LineEndings},
+        {Credo.Check.Consistency.SpaceAroundOperators},
+        {Credo.Check.Consistency.SpaceInParentheses},
+        {Credo.Check.Consistency.TabsOrSpaces},
+        {Credo.Check.Design.AliasUsage, false},
+        {Credo.Check.Readability.BlockPipe, false},
+        {Credo.Check.Readability.AliasOrder, false},
+        {Credo.Check.Readability.LargeNumbers, false},
+        {Credo.Check.Readability.MaxLineLength, false},
+        {Credo.Check.Readability.ModuleDoc, false},
+        {Credo.Check.Readability.PreferImplicitTry, false},
+        {Credo.Check.Readability.Semicolons, false},
+        {Credo.Check.Readability.StringSigils, false},
+        {Credo.Check.Readability.TrailingBlankLine, false},
+        {Credo.Check.Readability.UnnecessaryAliasExpansion, false},
+        {Credo.Check.Readability.WithSingleClause, false},
+        {Credo.Check.Refactor.Apply, false},
+        {Credo.Check.Refactor.CondStatements, false},
+        {Credo.Check.Refactor.CyclomaticComplexity, false},
+        {Credo.Check.Refactor.FilterFilter, false},
+        {Credo.Check.Refactor.FilterReject, false},
+        {Credo.Check.Refactor.FunctionArity, false},
+        {Credo.Check.Refactor.MapJoin, false},
+        {Credo.Check.Refactor.Nesting, false},
+        {Credo.Check.Refactor.NegatedConditionsWithElse, false},
+        {Credo.Check.Refactor.RejectFilter, false},
+        {Credo.Check.Refactor.RejectReject, false},
+        {Credo.Check.Refactor.RedundantWithClauseResult, false},
+        {Credo.Check.Warning.ApplicationConfigInModuleAttribute},
+        {Credo.Check.Warning.BoolOperationOnSameValues},
+        {Credo.Check.Warning.ExpensiveEmptyEnumCheck},
+        {Credo.Check.Warning.IExPry},
+        {Credo.Check.Warning.LazyLogging},
+        {Credo.Check.Warning.MissedMetadataKeyInLoggerConfig, false},
+        {Credo.Check.Warning.OperationOnSameValues},
+        {Credo.Check.Warning.RaiseInsideRescue}
+      ]
+    }
+  ]
+}

.gitattributes

@@ -0,0 +1,2 @@
+# Downloaded JS — exclude from language detection
+priv/**/*.js linguist-vendored=true

.mix_audit.ignore

@@ -0,0 +1,4 @@
+# GHSA-rhv4-8758-jx7v is pinned transitively through bumblebee -> progress_bar.
+# ecto_sqlite3 0.24.x can move to decimal 3.x, but that line is currently
+# unsatisfiable alongside the app's Bumblebee dependency.
+GHSA-rhv4-8758-jx7v

AGENTS.md

@@ -28,7 +28,9 @@ This document provides context and best practices for GitHub Copilot when workin
 - we have an allium spec in the specs/ folder. you must weed the specs against built code to make sure you follow the spec.
 - when changing the spec, validate the spec with the available command line tool.
 - you MUST run tests with command line tools at least once to capture compile errors in tests, do not use the integrated testing of vscode, as that blocks on compile errors
-- you MUST run build, test and check dialyzer messages and you MUST treet warnings as errors and fix them. we want clean builds, clean tests and clean dialyzer results
+- you MUST run build, test, credo, deps.audit and check dialyzer messages and you MUST treet warnings as errors and fix them. we want clean builds, clean tests, clean credo, clean dependency audits and clean dialyzer results
+- on a headless Linux machine, you have to run tests with this command (if mix test complains about DISPLAX): xvfb-run mix test
+- CSS precedence: Tailwind utilities and the ui-* kit (utilities.css) are in @layer and ALWAYS lose to the unlayered hand-written files (shell.css, panel.css, ...). Convention: hand-written CSS owns appearance, Tailwind utilities in templates own layout — never put display/flex-direction/size rules in hand-written CSS for elements whose layout the template controls, and define each selector in exactly one file.
 
 ---
 
@@ -54,7 +56,16 @@ This document provides context and best practices for GitHub Copilot when workin
 
 - Never leave tests failing, even if they appear unrelated to your changes
 - If a test failure is pre-existing, fix it as part of your current work
-- Run the full test suite (`npm test`) before considering any task complete
+- **Always write the full test run to a log file first, then grep that file for failures.** Never run `mix test` in the terminal and try to grep live output — the output is interleaved, truncated, and nearly impossible to parse. Pattern:
+  ```
+  mix test 2>&1 > /tmp/test_run.log
+  grep -E "FAILED|^[ ]*1\)" /tmp/test_run.log
+  grep -A 15 "^[ ]*1\)" /tmp/test_run.log   # details for the first failure
+  ```
+  Work from the log file, not from repeated terminal runs.
+
+> **Zero failing tests. No exceptions.**
+- Run the full test suite (`mix test`) before considering any task complete
 - If you cannot fix a test, explain why and propose a solution
 
 > **Zero failing tests. No exceptions.**
@@ -101,11 +112,52 @@ This document provides context and best practices for GitHub Copilot when workin
 
 ---
 
+## ⚠️ MANDATORY: macOS Bundle Must Be Fully Standalone
+
+**The built `BDS2.app` MUST run on a Mac without Homebrew.**
+
+- No Mach-O inside the `.app` may reference a Homebrew/local path (`/opt/homebrew`, `/usr/local`)
+- Every external dylib reachable from the release's NIFs must be copied into `Contents/Frameworks` and rewritten to `@loader_path`-relative install names (`BDS.MacBundle.Dylibs`)
+- The same physical dylib referenced under multiple names must be deduped (one real file + symlinks) so dyld loads a single image — duplicate images cause duplicate Objective-C class / wx event-table registrations
+- `BDS.MacBundle.verify_standalone/1` runs after relocation and fails the build if any external reference remains — do not weaken or bypass this gate
+
+> **The bundle must be self-contained. No outside references. No exceptions.**
+
+---
+
+## ⚠️ MANDATORY: macOS Bundle Build Order and Blogmark Verification
+
+**`mix release` copies `priv/static` as-is — it never rebuilds assets.** Always build in this order, or the bundle ships stale JS while the server code is current (this silently broke blogmark deep links in July 2026: the server waited for the client's `shell_ready` event that the stale `app.js` never sent, so every deep link queued forever with no error, no toast, no log):
+
+```
+mix assets.deploy
+MIX_ENV=prod mix release bds --overwrite
+mix bds.bundle.macos
+```
+
+**After building a bundle, verify blogmark deep links end-to-end with:**
+
+```
+scripts/verify_blogmark_macos.sh [path/to/BDS2.app]   # defaults to dist/macos/BDS2.app
+```
+
+The script launches the bundle via LaunchServices with an isolated database (`launchctl setenv BDS_DATABASE_PATH ...`), fires `bds2://new-post` links with `open -a` exactly like a browser bookmarklet, and asserts draft posts appear in the database — both for cold start (link launches the app, queued until the shell attaches) and for an already-running app. It refuses to run while any BDS2 instance is up; quit the app first.
+
+Things learned the hard way, encoded in the script — do not "simplify" them away:
+
+- Deep links only reach an app **launched through LaunchServices** (`open -a`). A process started by exec'ing `Contents/MacOS/bds2` from a shell never receives Apple Events, so deep links vanish without a trace. For the same reason `open` does not inherit the shell environment — inject env vars with `launchctl setenv` (and unset them afterwards).
+- To introspect a running bundle, launch it with `RELEASE_DISTRIBUTION=name` and `RELEASE_NODE=bds@127.0.0.1` set (via `launchctl setenv`), then use `.../Contents/Resources/rel/bin/bds rpc '<elixir>'` with the same env. The default `-sname` node is unreachable when the hostname resolves to LAN addresses.
+- The wx → `Desktop.Env` → `BDS.Desktop.DeepLink` → shell pipeline downstream of the OS can be exercised without LaunchServices via `send(Process.whereis(BDS.Desktop.DeepLink), {:open_url, ~c"bds2://new-post?..."})` over rpc.
+
+> **Assets before release. Verify blogmarks after bundling. No exceptions.**
+
+---
+
 ## ⚠️ MANDATORY: Proper I18N for UI and Rendering Text
 
 **All user-facing text MUST follow proper i18n patterns.**
 
-- Do not hardcode UI strings directly in React components, menu templates, dialogs, or toasts
+- Do not hardcode UI strings directly in LiveView/HEEx components, menu templates, dialogs, or toasts
 - Store UI copy in language resources and resolve text through i18n helpers/hooks
 - UI language MUST come from the operating system locale
 - Rendering/preview/generated-content language MUST come from project preferences (`mainLanguage`), not UI locale

API.md

@@ -40,6 +40,7 @@ local meta = bds.meta.get_project_metadata()
 - [app.get_default_project_path](#appget_default_project_path)
 - [app.get_system_language](#appget_system_language)
 - [app.get_title_bar_metrics](#appget_title_bar_metrics)
+- [app.log](#applog)
 - [app.notify_renderer_ready](#appnotify_renderer_ready)
 - [app.open_folder](#appopen_folder)
 - [app.read_project_metadata](#appread_project_metadata)
@@ -150,7 +151,7 @@ local result = bds.app.get_default_project_path()
 
 ### app.get_system_language
 
-Return the current UI locale.
+Return the current UI locale (the server-side UI language setting, falling back to the OS locale when unset).
 
 **Parameters**
 
@@ -202,6 +203,30 @@ nil  -- or
 local result = bds.app.get_title_bar_metrics()
 ```
 
+### app.log
+
+Append a line to the script output stream. Multiple arguments are joined with spaces. Output appears in the desktop app's Output panel (and on stdout in the CLI); Lua's global `print` is routed the same way.
+
+**Parameters**
+
+- text (string, required)
+
+**Response specification**
+
+- Return type: `boolean`
+
+**Example response**
+
+```lua
+true
+```
+
+**Example call**
+
+```lua
+local result = bds.app.log("value")
+```
+
 ### app.notify_renderer_ready
 
 Notify the host application that the renderer is ready.
@@ -3443,7 +3468,7 @@ local result = bds.meta.sync_on_startup()
 
 ### meta.update_project_metadata
 
-Update metadata for the current project.
+Update metadata for the current project. Keys omitted from updates keep their current values.
 
 **Parameters**
 

DOCUMENTATION.md

@@ -23,6 +23,7 @@
 - [Generating and publishing](#generating-and-publishing)
 - [Typical editorial workflows](#typical-editorial-workflows)
 - [Working fully offline](#working-fully-offline)
+- [Running a headless server and the terminal UI](#running-a-headless-server-and-the-terminal-ui)
 - [Troubleshooting and recovery](#troubleshooting-and-recovery)
 - [Team conventions](#team-conventions)
 
@@ -443,6 +444,29 @@ When AI is involved, airplane mode determines which automatic actions are allowe
 
 ---
 
+## Running a headless server and the terminal UI
+
+bDS2 can run without a window on a server (for example a Linux VPS) and be used from several places at once. Start it with `BDS_MODE=server`; the same release binary that runs the desktop app then runs headless. All clients connect through one SSH port (default 2222) — the web endpoint itself stays private on the server.
+
+Access is controlled by SSH keys, not passwords. On first start the server creates an `ssh/` folder next to its database (for example `~/Library/Application Support/BDS2/ssh/` on macOS) containing the host key and an empty `authorized_keys` file. Paste the public keys of every machine that may connect into `authorized_keys`, one per line — the same file format OpenSSH uses.
+
+To work in a terminal, connect with plain `ssh -p 2222 user@server`: the terminal UI opens directly. You can browse posts, media, templates, scripts, and tags, create and edit posts, publish, preview images, and run the one-shot AI actions. The status line at the bottom always shows the available keys.
+
+To work in the desktop app against a remote server, use **File → Connect to Server…** and enter `user@host` (or `user@host:port`). The app connects with the SSH key from its own local `ssh/` folder and shows the remote workspace in the window; **File → Disconnect from Server** returns to the local workspace. A plain browser works too, through a manual SSH tunnel (`ssh -p 2222 -L 4010:127.0.0.1:4010 user@server`, then open `http://127.0.0.1:4010`).
+
+Everything you see stays synchronized: when a script, another client, or a pipeline changes content on the server, every connected terminal and window updates. The interface language is a server-side setting — changing it in any client changes it for all of them.
+
+### Key takeaways
+
+- `BDS_MODE=server` runs the same app headless; only the SSH port is exposed.
+- Access is public-key only: manage `authorized_keys` in the server's `ssh/` folder.
+- `ssh` gives the terminal UI; **File → Connect to Server…** gives the desktop app; both use the same keys.
+- All connected clients stay synchronized and share one interface language.
+
+[↑ Back to In this article](#in-this-article)
+
+---
+
 ## Troubleshooting and recovery
 
 If content looks correct locally but is missing for collaborators, the usual cause is that changes were published but not committed and pushed. Check repository status, create a commit, then push to the expected remote.

README.md

@@ -12,6 +12,7 @@ The major architectural rework is in place.
 - Assets use Phoenix-default Tailwind and esbuild tooling from [assets/](/Users/gb/Projects/bDS2/assets) into [priv/static/](/Users/gb/Projects/bDS2/priv/static).
 - Core editorial flows are implemented in the main application: posts, media, tags, templates, scripts, imports, preview, generation, publishing, maintenance, AI, and MCP.
 - Localization is now a first-class architectural concern rather than an afterthought: UI chrome and rendered site output have separate locale flows, and post/media translation workflows are built into the domain model.
+- The app boots in three modes: the desktop app, a headless server (SSH-served terminal UI + tunneled GUI), and a local TUI — see [Headless Server Mode And Terminal UI](#headless-server-mode-and-terminal-ui).
 
 The rewrite still aims to preserve the product behavior of bDS while replacing the technical stack. The contract is product behavior, not the old implementation language or framework choices.
 
@@ -36,7 +37,7 @@ If you are tracing UI behavior, start there first:
 
 - LiveView event routing, workbench state, overlays, and menu handling live in the desktop shell modules.
 - HEEx templates under the same tree now own most common layout and state styling.
-- Monaco remains a vendor drop under [priv/ui/monaco/](/Users/gb/Projects/bDS2/priv/ui/monaco).
+- Monaco is bundled as an ESM bundle via esbuild into `priv/static/assets/monaco.js` and `monaco.css` (source entry at `assets/js/monaco_entry.js`).
 
 ### Domain Modules
 
@@ -156,6 +157,84 @@ mix dialyzer
 mix assets.build
 ```
 
+## Headless Server Mode And Terminal UI
+
+Since issue #26 the app has three boot modes, selected with the `BDS_MODE`
+environment variable (any release or dev boot; default is the desktop app):
+
+- `desktop` — the native desktop app, unchanged.
+- `server` — headless: no window, loopback-only HTTP endpoint, CLI sync
+  watcher, and an SSH daemon serving the terminal UI. Works on macOS,
+  Windows, and Linux (no display needed).
+- `tui` — the headless server plus a TUI attached to the launching terminal.
+
+### Build and run a headless server
+
+```bash
+MIX_ENV=prod mix release bds --overwrite
+BDS_MODE=server _build/prod/rel/bds/bin/bds start
+```
+
+The SSH daemon listens on port `2222` (`BDS_SSH_PORT` or
+`config :bds, :server, ssh_port:` to change). Authentication is public-key
+only: on first boot the server generates a host key and an empty
+`authorized_keys` (mode 600) in `ssh/` next to the database (default
+`~/Library/Application Support/BDS2/ssh/`, or under `BDS_DATABASE_PATH`).
+Add your public key there, then connect from any terminal:
+
+```bash
+ssh -p 2222 <server-host>          # opens the TUI
+```
+
+Each SSH connection gets its own TUI session on the server; only terminal
+cells cross the wire. All clients stay synchronized through the domain
+event bus (`BDS.Events`) — a post created by a pipeline or another client
+appears in every open shell.
+
+### TUI keys
+
+`↑/↓` or `j/k` navigate · `enter` open · `n` new post · `1-5` switch view
+(posts/media/templates/scripts/tags) · `:` command prompt (metadata
+diff, validate site, force render, rebuilds, …; `:?` lists all) ·
+metadata-diff/site-validation reports open as panels — `enter` applies
+the whole report (repair from files / incremental apply), `esc` cancels ·
+`r` refresh · in the editor:
+`ctrl+s` save, `ctrl+p` publish, `ctrl+e` word-wrapped preview,
+`ctrl+t` title, `ctrl+l` language, `ctrl+g` AI suggestions
+(airplane-mode gated), `esc` back · `ctrl+q` quit.
+Images preview inline via the terminal image protocol. The UI language is
+the server-side setting shared by every client.
+
+### Remote GUI
+
+The HTTP endpoint stays bound to `127.0.0.1` and is never exposed; GUI
+clients tunnel through the same SSH daemon and keys:
+
+```bash
+ssh -p 2222 -L 4010:127.0.0.1:4010 -N <server-host> &
+open http://127.0.0.1:4010
+```
+
+Or use the desktop app directly: **File → Connect to Server…** takes
+`user@host[:port]`, connects with the client key from the same local
+`ssh/` directory (public-key auth, trust-on-first-use `known_hosts`),
+tunnels to the server, and points the window at it. **File → Disconnect
+from Server** returns to the local workspace.
+
+## Monaco Editor
+
+Monaco is bundled via esbuild using its ESM entry point (`monaco-editor/esm/vs/editor/editor.main.js`). The
+main bundle is built as part of `mix assets.build` and lives at `priv/static/assets/monaco.js` and
+`monaco.css`; ESM worker bundles live under `priv/static/assets/monaco/`.
+
+```bash
+mix monaco.version    # show current monaco-editor version
+mix monaco.update 0.55.1  # update to a specific version and rebuild the bundle
+```
+
+The update task runs `npm install monaco-editor@<version>`, cleans the old bundle, and rebuilds via esbuild.
+See https://www.npmjs.com/package/monaco-editor for available versions.
+
 Notes for developers:
 
 - Specs in [specs/](/Users/gb/Projects/bDS2/specs) define the intended product behavior.

TUI_EDITOR.md

@@ -0,0 +1,223 @@
+# TUI Editor — Implementation Plan (Issue #32)
+
+Tracking issue: **#32** — "markdown, liquid and lua code editor with syntax
+highlighting in the TUI".
+Spec under change: `specs/tui.allium`.
+
+Goal: a syntax-highlighted, word-wrapping TUI editor for posts (markdown
+with `[[macro]]` syntax), templates (HTML + Liquid), and scripts (Lua),
+replacing the current plain `ExRatatui.Widgets.Textarea` body.
+
+## Decision: pure Elixir — no new Rust
+
+`ExRatatui` already ships everything we need:
+
+- `ExRatatui.CodeBlock.highlight/3` (`deps/ex_ratatui/lib/ex_ratatui/code_block.ex:103`)
+  returns `[%ExRatatui.Text.Line{}]` of styled spans via the bundled
+  syntect NIF. Supports Lua, Markdown, HTML, … out of the box.
+- `ExRatatui.Widgets.CodeBlock` is read-only; we do **not** use it
+  directly for editing.
+- `ExRatatui.Widget` protocol (`deps/ex_ratatui/lib/ex_ratatui/widget.ex:1`)
+  lets us implement a custom widget in pure Elixir that composes
+  primitives every frame. This is the seam we use.
+- The editing engine stays Rust-owned
+  (`ExRatatui.textarea_new/0`, `textarea_handle_key/3`, `textarea_get_value/1`,
+  `textarea_cursor/1`, `textarea_line_count/1`). The custom widget only
+  re-renders the buffer through a styling + wrap pipeline.
+- `ExRatatui.Widgets.Paragraph` accepts `[%Text.Line{}]` of styled spans
+  with `wrap: true` and a `scroll: {vertical, horizontal}` offset —
+  exactly the output shape we need.
+
+The existing comment at `lib/bds/tui.ex:1451-1454` already pre-announces
+this approach as "the planned MarkdownEditor custom widget".
+
+Languages supported (matches GUI Monaco registrations in
+`assets/js/monaco/languages.js`):
+
+| Entity                | Base lexer (NIF) | Elixir overlay                  |
+|-----------------------|------------------|---------------------------------|
+| post body             | `markdown`       | `[[macro …]]` recoloured        |
+| script body           | `lua`            | none                            |
+| template body         | `html`           | `{{ … }}` and `{% … %}` recoloured |
+
+Liquid is always HTML+Liquid in this codebase (no markdown+Liquid
+templates exist). Plain text falls back to syntect's plain renderer.
+
+## GUI styling parity (from `assets/js/monaco/theme.js` + `languages.js`)
+
+- **macro** `[[ … ]]` → `keyword.macro` = `#C586C0`, **bold**.
+- inside macro: `attribute.name` (e.g. `names`) → `#9CDCFE`,
+  `attribute.value` (e.g. `"x"`) → `#CE9178`.
+- Liquid uses base vs-dark tokens; terminal approximation uses the same
+  base theme accent colours. No custom Liquid token colours overridden.
+
+Use `{:rgb,197,134,192}` etc. via `ExRatatui.Style` (already supported
+by `ExRatatui.CodeBlock.from_native/1`).
+
+## Architecture
+
+```
+state.editor.textarea            (unchanged, Rust-owned buffer/cursor/undo)
+state.editor.language            (:markdown_macros | :liquid | :lua | :text)
+state.editor.preview?            (unchanged ctrl+e toggle — default false for posts)
+
+body_widget/3  edit branch:      %BDS.UI.CodeEditor{textarea:, language:, theme:, wrap:, cursor_style:, line_highlight_style:, block:}
+                                 ↳ impl ExRatatui.Widget.render:
+                                      1. content = ExRatatui.textarea_get_value(textarea)
+                                      2. {row, col} = ExRatatui.textarea_cursor(textarea)
+                                      3. lines = BDS.UI.CodeEditor.Highlight.highlight(content, language, theme)
+                                      4. apply current-line bg style into every span on lines[row]
+                                      5. cut the span at byte col on lines[row], splice cursor-style cell
+                                      6. top = vertical-scroll offset so cursor visual row stays in window (Latin-width count)
+                                      7. return [{%Paragraph{text: lines, wrap: true, scroll: {top,0}, block: block}, rect}]
+```
+
+`editor_key/1` in `lib/bds/tui.ex` keeps calling
+`ExRatatui.textarea_handle_key/3` — no edit-model rewrite, the
+textarea's own undo/redo/clipboard keeps working.
+
+## Phases (test-first, per AGENTS.md)
+
+### Phase 0 — Spec
+
+Edit `specs/tui.allium`:
+
+- `OpenEntry`: posts open in the **editor** (wrap on, highlighting on)
+  by default — not the rendered Markdown preview. New empty posts still
+  open in the editor (unchanged).
+- Rename `WrappedPreview` → `EditorMode`: `ctrl+e` toggles editor ↔
+  read-only rendered-Markdown preview (via `ExRatatui.Widgets.Markdown`).
+  Drop the "textarea cannot wrap" caveat.
+- Add `CodeEditorWrapping` rule: syntax highlighting + auto wrap +
+  highlighted current line. Explicitly **no line-number gutter**.
+- Validate with `allium check specs/tui.allium`.
+
+### Phase 1 — Red tests
+
+New file `test/bds/ui/code_editor_test.exs`:
+
+- `BDS.UI.CodeEditor.Highlight.highlight/3` for `:lua` colours a
+  `function … end` keyword with the theme's keyword colour.
+- `:markdown_macros` recolours `[[gallery names="x"]]`:
+  - `[[`, `]]` and macro name → `{:rgb,197,134,192}` bold
+  - `names` → `{:rgb,156,220,254}`
+  - `"x"` → `{:rgb,206,145,120}`
+  - surrounding markdown still base-styled.
+- `:liquid` recolours `{{ x }}` and `{% if x %}` over an HTML base;
+  `if` keyword distinct from identifiers.
+- Widget emits a `%Paragraph{wrap: true, scroll:}`, never a bare `%Textarea`,
+  when language is one of the highlighted set.
+
+Extended `test/bds/tui_test.exs`:
+
+- Opening an existing post lands in the **editor** (`preview? == false`),
+  not the rendered preview. Replace the assertion in
+  `test "opening a post lands in the markdown preview, not the editor"`.
+  Test name/logic flips.
+- Long line wraps across N visual rows in a 40-wide viewport
+  (assert via `CellSession.take_cells/1`).
+- Cursor at the last visual row stays visible when scrolling a small
+  viewport (assert cursor-style cell appears in snapshot cells).
+- Current line's cells have a distinct `bg` from non-current rows on
+  the same buffer.
+- `ctrl+e` flips to preview and back; preview still rendered Markdown.
+- `ctrl+s` persists textarea bytes unchanged regardless of highlight/wrap
+  (existing assertion still covers this — keep it green).
+
+### Phase 2 — `lib/bds/ui/code_editor/highlight.ex` + `overlay.ex`
+
+- `BDS.UI.CodeEditor.Highlight.highlight(content, language, theme)` →
+  `[%ExRatatui.Text.Line{}]`:
+  - `:lua`, `:text` → pass straight through to
+    `ExRatatui.CodeBlock.highlight/3`.
+  - `:markdown_macros` → base highlight as `"markdown"`, then apply
+    `Overlay.markdown_macros/1` per source line.
+  - `:liquid` → base highlight as `"html"`, then apply
+    `Overlay.liquid/1` per source line.
+- `BDS.UI.CodeEditor.Overlay`:
+  - `apply_ranges(line, ranges_with_styles)` — re-splits a `Line`'s
+    spans into a new span list, preserving the base styling outside
+    each range.
+  - `markdown_macro_ranges/1` — `~r/\[\[\s*[a-zA-Z][\w-]*[^]]*\]\]/s`.
+  - `macro_inner_ranges/1` — break `attr=` (attr-name) and quoted value
+    into separate styled sub-ranges inside a macro.
+  - `liquid_ranges/1` — `~r/(\{\{.*?\}\}|\{%-?\s*(\w+).*?-?%\})/s`,
+    with a sub-range for the tag keyword (`if`, `for`, `assign`, …).
+- Cache results by `{content_hash, language, theme}` if profiling shows
+  re-tokenisation overhead on keystroke (Phase 2 stretch goal —
+  skip until a test says otherwise).
+
+### Phase 3 — `lib/bds/ui/code_editor/widget.ex`
+
+- `%BDS.UI.CodeEditor{}` struct fields: `textarea`, `language`,
+  `theme` (default `:base16_ocean_dark`, readable in dark terminals),
+  `wrap: true`, `cursor_style`, `line_highlight_style`, `block`, `scroll`.
+- `defimpl ExRatatui.Widget` per the pipeline above.
+- Cursor cell: re-style the single codepoint at `col` on source line
+  `row` into `cursor_style`. Paragraph wraps the same line; the styled
+  cell rides the wrap.
+- Scroll math: count display rows by wrapping each source line into
+  `width` columns (Latin-width assumption — 1 char = 1 cell). Note the
+  limitation explicitly; CJK width is a follow-up if/when needed.
+- Line highlight: apply `line_highlight_style` (a `bg:` colour) to
+  every span on the cursor's source line before cursor cut-in.
+
+### Phase 4 — Wire into `lib/bds/tui.ex`
+
+- `build_editor/4` (around `lib/bds/tui.ex:1968`): default
+  `preview? = false` for existing posts. New posts already open in
+  editor — unchanged.
+- `body_widget/3` edit branch (`lib/bds/tui.ex:1466`): emit
+  `%BDS.UI.CodeEditor{}` instead of `%ExRatatui.Widgets.Textarea{}` for
+  entities that have a syntax highlighter (`:lua`, `:markdown_macros`,
+  `:liquid`). Plain text can keep `%Textarea{}` or feed `:text` through
+  the new widget — pick whichever keeps the test surface smaller.
+- Remove the "wrap limitation" comment block at
+  `lib/bds/tui.ex:1451-1454`.
+- `cycle_language/1` continues per post; cycle through the active
+  set (`:markdown_macros`, `:liquid`, `:lua`, `:text`) matching the
+  existing GUI editor language options.
+- Preview branch (`body_widget/3` preview arm at `lib/bds/tui.ex:1455`)
+  stays on `ExRatatui.Widgets.Markdown` — unchanged.
+- No new user-facing strings: the existing body title already flows
+  through `dgettext("ui", …)`. If a new toolbar/hint is added later,
+  it MUST go through gettext and provide de/fr/it/es translations.
+
+### Phase 5 — Verify
+
+- `mix test` (write to `/tmp/test_run.log` first, grep for failures —
+  per AGENTS.md).
+- `mix credo --strict`
+- `mix deps.audit --ignore-file .mix_audit.ignore`
+- `mix dialyzer` — treat warnings as errors.
+
+No bundle rebuild, no asset change, no NIF rebuild. Monaco still drives
+the GUI editor; this change is TUI-only.
+
+## Risks / limits
+
+- **Per-frame NIF cost:** re-tokenises the whole buffer on every
+  keystroke. For typical post sizes (<50 KB) syntect is sub-ms. Add the
+  `{content_hash, language, theme}` cache only if a test shows it.
+- **CJK cell width:** wrap math assumes 1 char = 1 cell. Fine for
+  de/fr/it/es. Note as TODO; not in scope for this phase.
+- **Liquid mis-lexing inside HTML** is cosmetically possible (an HTML
+  attribute containing `{{`). Overlay wins after the base lexer; the
+  result is visually tolerable. A custom `.sublime-syntax` in the
+  dep would be the real fix — out of scope here per "stay on Elixir".
+- **Cursor in a wrapped paragraph** rides the styled cell. Equivalent
+  to a cell-caret; GUI uses a real caret — acceptable TUI parity.
+
+## Files touched (expected)
+
+- `specs/tui.allium` — edited.
+- `lib/bds/ui/code_editor/highlight.ex` — new.
+- `lib/bds/ui/code_editor/overlay.ex` — new.
+- `lib/bds/ui/code_editor/widget.ex` — new.
+- `lib/bds/tui.ex` — edited (`build_editor`, `body_widget`, comment
+  removal, default `preview?`).
+- `test/bds/ui/code_editor_test.exs` — new.
+- `test/bds/tui_test.exs` — edited (flip the "opens in preview"
+  assertion, add wrap/cursor/current-line tests).
+
+No changes to `mix.exs`, no new deps, no Rust, no assets.

assets/css/app.css

@@ -3,10 +3,12 @@
 @source "../css";
 @source "../js";
 @source "../../lib/bds/desktop";
+@source "../../deps/live_toast/lib";
 
 @import "./tokens.css";
 @import "./shell.css";
 @import "./sidebar.css";
+@import "./git_sidebar.css";
 @import "./tabs.css";
 @import "./editor.css";
 @import "./forms.css";

assets/css/assistant.css

@@ -646,12 +646,6 @@
   max-width: 22px;
   max-height: 22px;
   padding: 0;
-  background: var(--vscode-button-background);
-  color: var(--vscode-button-foreground);
-}
-
-.chat-panel .chat-send-button:hover:not(:disabled) {
-  background: var(--vscode-button-hoverBackground);
 }
 
 .chat-panel .chat-send-button:disabled {

assets/css/editor.css

@@ -14,8 +14,7 @@
 
 .editor-main,
 .editor-meta,
-.panel-shell,
-.assistant-card {
+.panel-shell {
   min-width: 0;
 }
 
@@ -50,8 +49,7 @@
   border-radius: 3px;
 }
 
-.editor-toolbar-button:hover,
-.panel-tab:hover {
+.editor-toolbar-button:hover {
   background: var(--vscode-toolbar-hoverBackground);
 }
 
@@ -617,6 +615,14 @@
   white-space: nowrap;
 }
 
+.post-editor .tag-suggestion-section-label {
+  padding: 4px 12px;
+  font-size: 0.75rem;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  color: var(--vscode-descriptionForeground, #a6a6a6);
+}
+
 .post-editor .tag-suggestion.create-new {
   border-top: 1px solid var(--vscode-widget-border, #454545);
   margin-top: 4px;
@@ -742,8 +748,7 @@
 }
 
 .post-editor .editor-toolbar {
-  display: grid;
-  grid-template-columns: 1fr auto 1fr;
+  display: flex;
   align-items: center;
   gap: 8px;
   margin-bottom: 8px;
@@ -751,23 +756,27 @@
 
 .post-editor .editor-toolbar-left {
   display: flex;
+  flex: 1;
+  min-width: 0;
   align-items: center;
   justify-content: flex-start;
 }
 
 .post-editor .editor-toolbar-center {
   display: flex;
+  flex: none;
   align-items: center;
   justify-content: center;
 }
 
+/* ponytail: right group keeps its content width so buttons never wrap or
+   overlap the mode toggle; the left label shrinks instead */
 .post-editor .editor-toolbar-right {
   display: flex;
+  flex: 1 0 auto;
   align-items: center;
   justify-content: flex-end;
   gap: 6px;
-  min-width: 0;
-  flex-wrap: wrap;
 }
 
 .post-editor .editor-mode-toggle {
@@ -809,38 +818,6 @@
   display: none;
 }
 
-.post-editor .gallery-button {
-  padding: 4px 12px;
-  font-size: 12px;
-  border-radius: 4px;
-  background-color: var(--vscode-button-secondaryBackground);
-  color: var(--vscode-button-secondaryForeground);
-  border: none;
-  cursor: pointer;
-  transition: background-color 0.15s;
-}
-
-.post-editor .gallery-button:hover {
-  background-color: var(--vscode-button-secondaryHoverBackground);
-}
-
-.post-editor .insert-post-link-button,
-.post-editor .insert-media-button {
-  padding: 4px 8px;
-  font-size: 14px;
-  border-radius: 4px;
-  background-color: var(--vscode-button-secondaryBackground);
-  color: var(--vscode-button-secondaryForeground);
-  border: none;
-  cursor: pointer;
-  transition: background-color 0.15s;
-}
-
-.post-editor .insert-post-link-button:hover,
-.post-editor .insert-media-button:hover {
-  background-color: var(--vscode-button-secondaryHoverBackground);
-}
-
 .post-editor .editor-preview {
   flex: 1;
   background-color: var(--vscode-input-background);
@@ -929,8 +906,7 @@
   .post-editor .editor-header,
   .scripts-view-shell .ui-editor-header,
   .templates-view-shell .ui-editor-header,
-  .post-editor .metadata-toggle-header,
-  .post-editor .editor-toolbar {
+  .post-editor .metadata-toggle-header {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
@@ -946,7 +922,6 @@
     width: 100%;
   }
 
-  .post-editor .editor-toolbar-right,
   .post-editor .ui-editor-actions,
   .scripts-view-shell .ui-editor-actions,
   .templates-view-shell .ui-editor-actions {

assets/css/git_sidebar.css

@@ -0,0 +1,294 @@
+/* ── Git sidebar ─────────────────────────────────────────────────────── */
+
+.git-sidebar {
+  display: flex;
+  flex-direction: column;
+}
+
+/* ── Header ──────────────────────────────────────────────────────────── */
+
+.git-header {
+  padding: 8px 12px 12px;
+  border-bottom: 1px solid var(--vscode-sideBar-border);
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.git-branch {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--vscode-sideBar-foreground);
+}
+
+.git-branch-icon {
+  font-size: 14px;
+  color: var(--vscode-descriptionForeground);
+  flex-shrink: 0;
+}
+
+.git-upstream {
+  font-size: 11px;
+  color: var(--vscode-descriptionForeground);
+  padding: 1px 6px;
+  border-radius: 999px;
+  background: var(--vscode-badge-background);
+  color: var(--vscode-badge-foreground);
+}
+
+.git-ahead {
+  font-size: 11px;
+  color: var(--vscode-testing-iconPassed);
+}
+
+.git-behind {
+  font-size: 11px;
+  color: var(--vscode-notificationsInfoIcon-foreground);
+}
+
+/* ── Sync legend ─────────────────────────────────────────────────────── */
+
+.git-legend-item {
+  font-size: 10px;
+  color: var(--vscode-descriptionForeground);
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.git-sync-dot {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  flex-shrink: 0;
+}
+
+.git-sync-synced {
+  background-color: var(--vscode-testing-iconPassed);
+}
+
+.git-sync-local_only {
+  background-color: var(--vscode-editorWarning-foreground);
+}
+
+.git-sync-remote_only {
+  background-color: var(--vscode-notificationsInfoIcon-foreground);
+}
+
+/* ── Actions ─────────────────────────────────────────────────────────── */
+
+.git-actions {
+  border-bottom: 1px solid var(--vscode-sideBar-border);
+  padding: 8px 12px;
+}
+
+.git-action-button {
+  flex: 1;
+  padding: 4px 8px;
+  font-size: 11px;
+  background-color: var(--vscode-button-secondaryBackground);
+  color: var(--vscode-button-secondaryForeground);
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  transition: background-color 0.15s;
+  text-align: center;
+}
+
+.git-action-button:hover:not(:disabled) {
+  background-color: var(--vscode-button-secondaryHoverBackground);
+}
+
+.git-action-button:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+/* ── Sections ────────────────────────────────────────────────────────── */
+
+.git-section {
+  padding: 0;
+}
+
+.git-section-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 8px 12px;
+  font-size: 11px;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  color: var(--vscode-sideBar-foreground);
+}
+
+.git-section-count {
+  font-size: 10px;
+  color: var(--vscode-descriptionForeground);
+}
+
+/* ── Forms ───────────────────────────────────────────────────────────── */
+
+.git-commit-form,
+.git-init-form {
+  padding: 8px 12px;
+  border-bottom: 1px solid var(--vscode-sideBar-border);
+}
+
+.git-commit-form input,
+.git-init-form input {
+  padding: 4px 8px;
+  font-size: 12px;
+  background-color: var(--vscode-input-background);
+  border: 1px solid var(--vscode-input-border);
+  color: var(--vscode-input-foreground);
+  border-radius: 3px;
+}
+
+.git-commit-form input::placeholder,
+.git-init-form input::placeholder {
+  color: var(--vscode-input-placeholderForeground);
+}
+
+.git-commit-form input:focus,
+.git-init-form input:focus {
+  outline: none;
+  border-color: var(--vscode-focusBorder);
+}
+
+.git-commit-form .git-action-button,
+.git-init-form .git-action-button {
+  flex: 1;
+}
+
+/* ── Status file list ────────────────────────────────────────────────── */
+
+.git-status-file {
+  width: 100%;
+  padding: 5px 12px;
+  border: none;
+  border-radius: 0;
+  background: transparent;
+  color: var(--vscode-sideBar-foreground);
+  cursor: pointer;
+  text-align: left;
+  font-size: 12px;
+}
+
+.git-status-file:hover {
+  background-color: var(--vscode-list-hoverBackground);
+}
+
+.git-status-path {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  flex: 1;
+  min-width: 0;
+}
+
+.git-status-badge {
+  font-size: 10px;
+  font-weight: 700;
+  padding: 1px 5px;
+  border-radius: 4px;
+  flex-shrink: 0;
+  text-transform: uppercase;
+}
+
+.git-status-added {
+  color: var(--vscode-testing-iconPassed);
+  background: color-mix(in srgb, var(--vscode-testing-iconPassed) 15%, transparent);
+}
+
+.git-status-modified {
+  color: var(--vscode-editorWarning-foreground);
+  background: color-mix(in srgb, var(--vscode-editorWarning-foreground) 15%, transparent);
+}
+
+.git-status-deleted {
+  color: var(--vscode-errorForeground);
+  background: color-mix(in srgb, var(--vscode-errorForeground) 15%, transparent);
+}
+
+.git-status-renamed {
+  color: var(--vscode-notificationsInfoIcon-foreground);
+  background: color-mix(in srgb, var(--vscode-notificationsInfoIcon-foreground) 15%, transparent);
+}
+
+.git-status-untracked {
+  color: var(--vscode-descriptionForeground);
+  background: color-mix(in srgb, var(--vscode-descriptionForeground) 15%, transparent);
+}
+
+/* ── Commit history list ─────────────────────────────────────────────── */
+
+.git-history-entry {
+  width: 100%;
+  padding: 5px 12px;
+  border: none;
+  border-radius: 0;
+  background: transparent;
+  color: var(--vscode-sideBar-foreground);
+  cursor: pointer;
+  text-align: left;
+}
+
+.git-history-entry:hover {
+  background-color: var(--vscode-list-hoverBackground);
+}
+
+.git-history-subject {
+  font-size: 12px;
+  color: var(--vscode-sideBar-foreground);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.git-history-meta {
+  margin-top: 2px;
+}
+
+.git-history-hash,
+.git-history-author,
+.git-history-date {
+  font-size: 10px;
+  color: var(--vscode-descriptionForeground);
+}
+
+.git-history-hash {
+  font-family: var(--vscode-editor-font-family);
+}
+
+.git-history-more {
+  padding: 8px 12px;
+  font-size: 11px;
+  color: var(--vscode-descriptionForeground);
+  text-align: center;
+}
+
+/* ── Empty / Not-a-repo state ────────────────────────────────────────── */
+
+.git-not-a-repo {
+  padding: 12px;
+}
+
+.git-empty-hint {
+  font-size: 12px;
+  color: var(--vscode-descriptionForeground);
+  padding: 8px 12px;
+}
+
+/* ── Divider between sections ────────────────────────────────────────── */
+
+.git-section + .git-section {
+  border-top: 1px solid var(--vscode-sideBar-border);
+}
+
+/* ── Section header that matches sidebar-section-header ───────────────── */
+
+.git-header + .git-actions {
+  border-top: 1px solid var(--vscode-sideBar-border);
+}

assets/css/import_editor.css

@@ -67,30 +67,12 @@
   color: var(--vscode-descriptionForeground);
 }
 
-.import-analysis button,
 .import-analysis select {
   border: 1px solid var(--vscode-button-border, transparent);
   border-radius: 6px;
   font-size: 12px;
 }
 
-.import-analysis button {
-  background: var(--vscode-button-secondaryBackground, var(--vscode-button-background));
-  color: var(--vscode-button-secondaryForeground, var(--vscode-button-foreground));
-  padding: 8px 12px;
-  cursor: pointer;
-}
-
-.import-analysis button:hover:not(:disabled) {
-  background: var(--vscode-button-secondaryHoverBackground, var(--vscode-button-hoverBackground));
-}
-
-.import-analyze-btn,
-.import-execute-btn {
-  background: var(--vscode-button-background) !important;
-  color: var(--vscode-button-foreground) !important;
-}
-
 .import-analysis button:disabled {
   opacity: 0.65;
   cursor: not-allowed;
@@ -110,7 +92,7 @@
   width: 18px;
   height: 18px;
   border: 2px solid var(--vscode-descriptionForeground);
-  border-top-color: var(--vscode-button-background);
+  border-top-color: var(--vscode-button-background, #0e639c);
   border-radius: 50%;
   animation: import-spinner-rotate 0.8s linear infinite;
   flex-shrink: 0;

assets/css/media_editor.css

@@ -106,8 +106,8 @@
 }
 
 [data-testid="media-editor"] .media-preview-image img {
-  width: 100%;
-  height: 100%;
+  max-width: 100%;
+  max-height: 100%;
   object-fit: contain;
   border-radius: 4px;
 }
@@ -128,20 +128,6 @@
   align-items: center;
 }
 
-[data-testid="media-editor"] .add-link-btn {
-  background: var(--vscode-button-secondaryBackground);
-  border: none;
-  color: var(--vscode-button-secondaryForeground);
-  padding: 2px 8px;
-  border-radius: 3px;
-  cursor: pointer;
-  font-size: 11px;
-}
-
-[data-testid="media-editor"] .add-link-btn:hover {
-  background: var(--vscode-button-secondaryHoverBackground);
-}
-
 [data-testid="media-editor"] .post-picker {
   background: var(--vscode-dropdown-background);
   border: 1px solid var(--vscode-dropdown-border);

assets/css/misc_editor.css

@@ -537,3 +537,8 @@
   border: 1px solid var(--vscode-panel-border);
   border-radius: 4px;
 }
+
+.monaco-diff-editor-instance {
+  width: 100%;
+  height: 100%;
+}

assets/css/overlays.css

@@ -19,6 +19,7 @@
 .language-picker-modal-backdrop,
 .confirm-delete-modal-backdrop,
 .confirm-dialog-overlay,
+.git-run-backdrop,
 .gallery-overlay,
 .lightbox-overlay {
   position: fixed;
@@ -35,6 +36,7 @@
 .language-picker-modal,
 .confirm-delete-modal,
 .confirm-dialog,
+.git-run-modal,
 .gallery-overlay-content {
   position: relative;
   z-index: 1;
@@ -44,6 +46,76 @@
   box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4);
 }
 
+.git-run-modal {
+  width: min(760px, calc(100vw - 32px));
+  max-height: calc(100vh - 48px);
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.git-run-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 12px 16px;
+  border-bottom: 1px solid #3c3c3c;
+}
+
+.git-run-title {
+  margin: 0;
+  font-size: 14px;
+  font-family: var(--font-mono, monospace);
+}
+
+.git-run-status {
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.git-run-status.running {
+  color: #d7ba7d;
+}
+
+.git-run-status.ok {
+  color: #4ec9b0;
+}
+
+.git-run-status.fail {
+  color: #f48771;
+}
+
+.git-run-output {
+  margin: 0;
+  padding: 12px 16px;
+  overflow: auto;
+  flex: 1;
+  min-height: 160px;
+  max-height: 60vh;
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-family: var(--font-mono, monospace);
+  font-size: 12px;
+  line-height: 1.5;
+  background: #141414;
+}
+
+.git-run-stdout {
+  color: #d4d4d4;
+}
+
+.git-run-stderr {
+  color: #f48771;
+}
+
+.git-run-footer {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 16px;
+  border-top: 1px solid #3c3c3c;
+}
+
 .ai-suggestions-modal,
 .language-picker-modal,
 .confirm-delete-modal,
@@ -257,8 +329,7 @@
 }
 
 .ai-suggestions-modal-footer,
-.confirm-delete-modal-footer,
-.confirm-dialog-actions {
+.confirm-delete-modal-footer {
   display: flex;
   justify-content: flex-end;
   gap: 10px;
@@ -266,42 +337,12 @@
   border-top: 1px solid #3c3c3c;
 }
 
-.button-cancel,
-.button-delete,
-.button-apply,
-.confirm-dialog-actions button,
-.insert-modal-submit,
 .language-picker-row,
 .shared-popover-entry,
 .colour-swatch {
   cursor: pointer;
 }
 
-.button-cancel,
-.confirm-dialog-actions button,
-.insert-modal-submit {
-  border: 1px solid #4c4c4c;
-  border-radius: 4px;
-  padding: 8px 14px;
-  background: transparent;
-  color: #f0f0f0;
-}
-
-.button-apply,
-.confirm-dialog-actions .primary,
-.insert-modal-submit {
-  background: #0e639c;
-  border-color: #0e639c;
-}
-
-.button-delete {
-  border: none;
-  border-radius: 4px;
-  padding: 8px 14px;
-  background: #c73c3c;
-  color: #ffffff;
-}
-
 .insert-modal-tabs {
   display: flex;
   margin: 0 -20px;
@@ -336,3 +377,78 @@
   font: inherit;
 }
 
+.insert-modal-results {
+  overflow: auto;
+  padding: 8px 0;
+}
+
+.insert-modal-result-item {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  border: none;
+  background: transparent;
+  color: inherit;
+  padding: 10px 20px;
+  text-align: left;
+  cursor: pointer;
+  font: inherit;
+}
+
+.insert-modal-result-item:hover {
+  background: #252526;
+}
+
+.insert-modal-result-title {
+  color: #ffffff;
+  font-weight: 600;
+}
+
+.insert-modal-result-meta {
+  color: #9d9d9d;
+  font-size: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.insert-modal-status {
+  padding: 16px 20px;
+  color: #9d9d9d;
+}
+
+.insert-modal-external {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding: 16px 20px;
+}
+
+.insert-modal-external .insert-modal-input {
+  padding: 8px 10px;
+  border: 1px solid #3c3c3c;
+  border-radius: 4px;
+  background: #252526;
+}
+
+.insert-modal-field {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.insert-modal-label {
+  color: #9d9d9d;
+  font-size: 12px;
+}
+
+.insert-modal-submit {
+  align-self: flex-end;
+}
+
+
+/* Alert modal (errors) — reuses .confirm-delete-modal with a tone accent. */
+.alert-modal-error {
+  border-top: 3px solid #ff6b6b;
+}

assets/css/panel.css

@@ -8,14 +8,11 @@
   display: none;
 }
 
-.panel-tabs {
-  display: flex;
-  gap: 8px;
-}
-
 .panel-tabs {
   display: flex;
   gap: 2px;
+  align-items: stretch;
+  height: 100%;
 }
 
 .panel-tab {
@@ -116,7 +113,6 @@
 }
 
 .assistant-sidebar-prompt-form,
-.assistant-sidebar-welcome,
 .assistant-sidebar-transcript {
   display: flex;
   flex-direction: column;
@@ -142,12 +138,6 @@
 
 .assistant-sidebar-start-button {
   align-self: flex-start;
-  border: 1px solid var(--vscode-button-border, transparent);
-  border-radius: 999px;
-  background: var(--vscode-button-background);
-  color: var(--vscode-button-foreground);
-  padding: 7px 14px;
-  cursor: pointer;
 }
 
 .assistant-sidebar-start-button:disabled {
@@ -155,7 +145,6 @@
   opacity: 0.55;
 }
 
-.assistant-card,
 .assistant-sidebar-message {
   display: flex;
   flex-direction: column;
@@ -254,6 +243,12 @@
   background-color: var(--vscode-sideBar-background);
 }
 
+/* .panel-entry (shell.css) forces flex-direction: column and, being unlayered,
+   beats the Tailwind row utilities on this button — force the row here. */
+.task-group-toggle {
+  flex-direction: row;
+}
+
 .output-entry {
   padding: 8px;
   border-bottom: none;

assets/css/shell.css

@@ -402,24 +402,6 @@
   border-bottom: 1px solid var(--vscode-panel-border);
 }
 
-.panel-tabs {
-  display: flex;
-  align-items: stretch;
-  height: 100%;
-}
-
-.panel-tab {
-  border: none;
-  background: transparent;
-  color: var(--vscode-descriptionForeground);
-  padding: 0 12px;
-  cursor: pointer;
-}
-
-.panel-tab.active {
-  color: var(--vscode-tab-activeForeground);
-}
-
 .panel-close {
   background: transparent;
   border: none;
@@ -446,8 +428,7 @@
   padding: 12px 14px;
 }
 
-.panel-entry,
-.assistant-card {
+.panel-entry {
   display: flex;
   flex-direction: column;
   gap: 4px;
@@ -602,14 +583,16 @@
   background: transparent;
   color: inherit;
   cursor: pointer;
-  opacity: 0.4;
   font-size: 13px;
   padding: 0 4px;
 }
 
 .status-bar-item.offline-badge.active {
-  background-color: rgba(255, 196, 0, 0.28);
+  background-color: #e6a800;
+  color: #000;
+  font-weight: 600;
   opacity: 1;
+  border-radius: 3px;
 }
 
 .project-selector {
@@ -777,19 +760,6 @@
   padding-left: 18px;
 }
 
-.editor-toolbar {
-  display: flex;
-  gap: 10px;
-}
-
-.editor-toolbar button {
-  padding: 9px 14px;
-  border: 1px solid var(--line);
-  border-radius: 999px;
-  background: var(--panel-3);
-  color: var(--ink);
-}
-
 .editor-meta {
   display: flex;
   flex-direction: column;
@@ -797,18 +767,7 @@
 }
 
 .editor-meta-card,
-.assistant-card,
 .panel-entry {
   padding: 16px;
 }
 
-.sidebar-header,
-.assistant-header,
-.panel-header {
-  display: flex;
-  justify-content: space-between;
-  gap: 12px;
-  padding: 16px 18px;
-  border-bottom: 1px solid var(--line);
-}
-

assets/css/sidebar.css

@@ -148,7 +148,6 @@
   gap: 2px;
 }
 
-.assistant-card span,
 .panel-entry span,
 .editor-meta-row span,
 .editor-subtitle,
@@ -777,8 +776,8 @@
 }
 
 .filter-chip.active {
-  background-color: var(--vscode-button-background);
-  color: var(--vscode-button-foreground);
+  background-color: var(--vscode-button-background, #0e639c);
+  color: var(--vscode-button-foreground, #ffffff);
 }
 
 .filter-chip.has-color {

assets/css/tokens.css

@@ -37,6 +37,9 @@
   --vscode-editorGroupHeader-tabsBorder: #1e1e1e;
   --vscode-toolbar-hoverBackground: rgba(90, 93, 94, 0.31);
   --vscode-toolbar-activeBackground: rgba(99, 102, 103, 0.31);
+  --vscode-button-secondaryBackground: rgba(255, 255, 255, 0.08);
+  --vscode-button-secondaryForeground: #cccccc;
+  --vscode-button-secondaryHoverBackground: #4a4d51;
   --vscode-foreground: #cccccc;
   --vscode-descriptionForeground: #858585;
   --vscode-panel-border: #80808059;
@@ -130,12 +133,13 @@ button.compact {
 }
 
 button.primary {
-  background-color: var(--vscode-button-background);
+  color: var(--vscode-button-foreground, #ffffff);
+  background-color: var(--vscode-button-background, #0e639c);
   font-weight: 500;
 }
 
 button.primary:hover {
-  background-color: var(--vscode-button-hoverBackground);
+  background-color: var(--vscode-button-hoverBackground, #1177bb);
 }
 
 button.success {

assets/js/hooks/app_shell.js

@@ -19,6 +19,7 @@ import {
 } from "../utils/shortcuts.js";
 import { syncTitlebarOverlayInsets } from "../bridges/titlebar_overlay.js";
 import { runMenuRuntimeCommand } from "../bridges/menu_runtime.js";
+import { copyTextToClipboard } from "../utils/clipboard.js";
 
 export const AppShell = {
   mounted() {
@@ -179,6 +180,10 @@ export const AppShell = {
       }
     });
 
+    this.handleEvent("clipboard", ({ text }) => {
+      copyTextToClipboard(text || "");
+    });
+
     window.addEventListener("bds:native-menu-action", this.handleNativeMenuAction);
     window.addEventListener("keydown", this.handleShortcutKeyDown, true);
     this.el.addEventListener("load", this.handleThumbnailLoad, true);
@@ -186,6 +191,9 @@ export const AppShell = {
     this.el.addEventListener("change", this.handleChange);
     syncMediaThumbnailState(this.el);
     this.restoreStoredWorkbenchSession();
+    // Rehydration is done (any stored-session push is ordered before this):
+    // tell the server it may now deliver queued deep links.
+    this.pushEvent("shell_ready", {});
   },
 
   updated() {

assets/js/hooks/chat_surface.js

@@ -3,6 +3,9 @@ export const ChatSurface = {
     this.stickToBottom = true;
     this.scrollContainer = null;
 
+    this._enterKeyHandled = false;
+    this._prevInputValue = "";
+
     this.autoResize = () => {
       const textarea = this.el.querySelector(".chat-input");
 
@@ -85,11 +88,34 @@ export const ChatSurface = {
       this.stickToBottom = distanceFromBottom < 48;
     };
 
+    this._submitChat = () => {
+      const form = this.el.querySelector(".chat-input-wrapper");
+      if (form && typeof form.requestSubmit === "function") {
+        form.requestSubmit();
+      } else {
+        const sendButton = this.el.querySelector("[data-testid='chat-send-button']");
+        if (sendButton) sendButton.click();
+      }
+    };
+
     this.handleInput = (event) => {
       if (!event.target.closest(".chat-input")) {
         return;
       }
 
+      const textarea = event.target;
+
+      if (!this._enterKeyHandled && textarea.value.includes("\n") && !this._prevInputValue.includes("\n")) {
+        textarea.value = textarea.value.replace(/\n/g, "");
+        this._prevInputValue = textarea.value;
+        this.stickToBottom = true;
+        this.autoResize();
+        this._submitChat();
+        return;
+      }
+
+      this._enterKeyHandled = false;
+      this._prevInputValue = textarea.value;
       this.stickToBottom = true;
       this.autoResize();
     };
@@ -101,12 +127,8 @@ export const ChatSurface = {
 
       if (event.key === "Enter" && !event.shiftKey && !event.isComposing) {
         event.preventDefault();
-
-        const sendButton = this.el.querySelector("[data-testid='chat-send-button']");
-
-        if (sendButton && !sendButton.disabled) {
-          sendButton.click();
-        }
+        this._enterKeyHandled = true;
+        this._submitChat();
       }
     };
 

assets/js/hooks/index.js

@@ -6,8 +6,10 @@ import { ColourPicker } from "./colour_picker.js";
 import { MenuEditorTree } from "./menu_editor_tree.js";
 import { MonacoEditor } from "./monaco_editor.js";
 import { MonacoDiffEditor } from "./monaco_diff_editor.js";
+import { createLiveToastHook } from "live_toast";
 
 export const Hooks = {
+  LiveToast: createLiveToastHook(),
   AppShell,
   SidebarInteractions,
   SettingsSectionScroll,

assets/js/hooks/monaco_editor.js

@@ -5,6 +5,66 @@ import {
   unregisterMonacoEditor
 } from "../monaco/services.js";
 
+const WEBKIT_TEXTAREA_ARROW_COMMANDS = {
+  ArrowLeft: "cursorLeft",
+  ArrowRight: "cursorRight",
+  ArrowUp: "cursorUp",
+  ArrowDown: "cursorDown"
+};
+
+const isWebKitEngine = () => {
+  const userAgent = globalThis.navigator?.userAgent || "";
+  return userAgent.includes("AppleWebKit") && !userAgent.includes("Chrome") && !userAgent.includes("Chromium");
+};
+
+const isMonacoInputArea = (target) =>
+  target instanceof HTMLTextAreaElement && target.classList.contains("inputarea");
+
+export const webKitTextAreaArrowCommand = (event) => {
+  if (event?.altKey || event?.ctrlKey || event?.metaKey) {
+    return null;
+  }
+
+  const command = WEBKIT_TEXTAREA_ARROW_COMMANDS[event?.key];
+
+  if (!command) {
+    return null;
+  }
+
+  return event.shiftKey ? `${command}Select` : command;
+};
+
+// Applying a remote value via setValue resets the cursor to the buffer start,
+// which then makes follow-up actions (like link inserts targeting the current
+// selection) land at position 1,1. Capture and restore the selection so the
+// cursor survives server-driven reconciles; Monaco clamps out-of-range
+// positions to the new content.
+export const applyRemoteEditorValue = (editor, value) => {
+  const selections = editor.getSelections ? editor.getSelections() : null;
+  editor.setValue(value);
+
+  if (selections && selections.length > 0 && editor.setSelections) {
+    editor.setSelections(selections);
+  }
+};
+
+export const bridgeWebKitTextAreaArrowKey = (editor, event) => {
+  if (!editor || !isMonacoInputArea(event.target)) {
+    return false;
+  }
+
+  const command = webKitTextAreaArrowCommand(event);
+
+  if (!command) {
+    return false;
+  }
+
+  event.preventDefault();
+  event.stopPropagation();
+  editor.trigger("keyboard", command, { source: "keyboard" });
+  return true;
+};
+
 export const MonacoEditor = {
   mounted() {
     this.textarea = document.getElementById(this.el.dataset.monacoInputId) || this.el.querySelector("textarea");
@@ -17,6 +77,10 @@ export const MonacoEditor = {
     this.isApplyingRemoteUpdate = false;
     this.lastKnownValue = this.textarea?.value || "";
 
+    this.handleWebKitTextAreaArrowKey = (event) => {
+      bridgeWebKitTextAreaArrowKey(this.editor, event);
+    };
+
     this.syncEditorFromTextarea = () => {
       this.textarea = document.getElementById(this.el.dataset.monacoInputId) || this.el.querySelector("textarea");
 
@@ -26,11 +90,29 @@ export const MonacoEditor = {
 
       const value = this.textarea.value || "";
 
+      // ponytail: ignore the server echoing back our own last-emitted value;
+      // only a genuinely remote value (translation switch, etc.) should reset
+      // the editor. Otherwise mid-typing echoes clobber the cursor to offset 0.
+      if (value === this.lastKnownValue) {
+        return;
+      }
+
+      // While the user is actively typing, Monaco owns the content. Never let a
+      // server re-render (autosave, dirty toggle, metadata) yank it out from
+      // under the cursor — reconcile only once the editor is blurred.
+      if (this.editor.hasTextFocus()) {
+        return;
+      }
+
       if (this.editor.getValue() !== value) {
         this.isApplyingRemoteUpdate = true;
-        this.editor.setValue(value);
+
+        try {
+          applyRemoteEditorValue(this.editor, value);
+        } finally {
           this.isApplyingRemoteUpdate = false;
         }
+      }
 
       this.lastKnownValue = value;
     };
@@ -232,6 +314,10 @@ export const MonacoEditor = {
           this.el.addEventListener("dragover", this.handleDragOver);
           this.el.addEventListener("drop", this.handleDrop);
         }
+
+        if (isWebKitEngine()) {
+          this.host.addEventListener("keydown", this.handleWebKitTextAreaArrowKey, true);
+        }
       })
       .catch((error) => {
         console.error("Failed to load Monaco editor", error);
@@ -273,6 +359,8 @@ export const MonacoEditor = {
       this.el.removeEventListener("drop", this.handleDrop);
     }
 
+    this.host?.removeEventListener("keydown", this.handleWebKitTextAreaArrowKey, true);
+
     unregisterMonacoEditor(this.editorId || this.el.id);
     this.editor?.dispose();
   }

assets/js/monaco/services.js

@@ -1,11 +1,54 @@
-import { loadScript } from "../utils/script_loader.js";
 import { ensureMonacoTheme } from "./theme.js";
 import { registerLiquidLanguage, registerMarkdownWithMacrosLanguage } from "./languages.js";
 
 let monacoLoaderPromise;
 const monacoEditors = new Map();
 
+const monacoWorkerUrls = {
+  editor: "/assets/monaco/editor.worker.js",
+  css: "/assets/monaco/css.worker.js",
+  html: "/assets/monaco/html.worker.js",
+  json: "/assets/monaco/json.worker.js",
+  ts: "/assets/monaco/ts.worker.js"
+};
+
+const workerNameForLanguage = (label) => {
+  switch (label) {
+    case "css":
+    case "scss":
+    case "less":
+      return "css";
+    case "html":
+    case "handlebars":
+    case "razor":
+      return "html";
+    case "json":
+      return "json";
+    case "typescript":
+    case "javascript":
+      return "ts";
+    default:
+      return "editor";
+  }
+};
+
+const ensureMonacoEnvironment = () => {
+  if (globalThis.MonacoEnvironment?.getWorker) {
+    return;
+  }
+
+  globalThis.MonacoEnvironment = {
+    ...globalThis.MonacoEnvironment,
+    getWorker(_workerId, label) {
+      const workerName = workerNameForLanguage(label);
+      return new Worker(monacoWorkerUrls[workerName], { name: label, type: "module" });
+    }
+  };
+};
+
 export const loadMonaco = () => {
+  ensureMonacoEnvironment();
+
   if (window.monaco?.editor) {
     ensureMonacoTheme(window.monaco);
     registerLiquidLanguage(window.monaco);
@@ -17,20 +60,17 @@ export const loadMonaco = () => {
     return monacoLoaderPromise;
   }
 
-  monacoLoaderPromise = loadScript("/monaco/vs/loader.js")
-    .then(
-      () =>
-        new Promise((resolve, reject) => {
-          window.require.config({ paths: { vs: "/monaco/vs" } });
-          window.require(["vs/editor/editor.main"], () => {
-            ensureMonacoTheme(window.monaco);
-            registerLiquidLanguage(window.monaco);
-            registerMarkdownWithMacrosLanguage(window.monaco);
-            resolve(window.monaco);
-          }, reject);
+  monacoLoaderPromise = import("/assets/monaco.js")
+    .then((monaco) => {
+      window.monaco = monaco;
+      if (!monaco.editor) throw new Error("Monaco loaded but monaco.editor is missing");
+      ensureMonacoTheme(monaco);
+      registerLiquidLanguage(monaco);
+      registerMarkdownWithMacrosLanguage(monaco);
+      return monaco;
     })
-    )
     .catch((error) => {
+      console.error("Monaco load failed:", error);
       monacoLoaderPromise = null;
       throw error;
     });

assets/js/monaco_entry.js

@@ -0,0 +1,3 @@
+// ESM entry point for Monaco. Bundled by esbuild into priv/static/assets/monaco.js
+// editor.main.js loads the API AND registers all bundled languages (api.js only exposes the API)
+export * from "monaco-editor/esm/vs/editor/editor.main.js";

assets/js/monaco_workers/css.worker.js

@@ -0,0 +1 @@
+import "monaco-editor/esm/vs/language/css/css.worker.js";

assets/js/monaco_workers/editor.worker.js

@@ -0,0 +1 @@
+import "monaco-editor/esm/vs/editor/editor.worker.js";

assets/js/monaco_workers/html.worker.js

@@ -0,0 +1 @@
+import "monaco-editor/esm/vs/language/html/html.worker.js";

assets/js/monaco_workers/json.worker.js

@@ -0,0 +1 @@
+import "monaco-editor/esm/vs/language/json/json.worker.js";

assets/js/monaco_workers/ts.worker.js

@@ -0,0 +1 @@
+import "monaco-editor/esm/vs/language/typescript/ts.worker.js";

assets/js/utils/clipboard.js

@@ -0,0 +1,27 @@
+// Copies text to the system clipboard, mirroring the old app's behavior:
+// navigator.clipboard when available, with a hidden-textarea fallback for
+// webviews that lack the async clipboard API.
+export const copyTextToClipboard = async (text) => {
+  if (typeof navigator !== "undefined" && navigator.clipboard && typeof navigator.clipboard.writeText === "function") {
+    await navigator.clipboard.writeText(text);
+    return;
+  }
+
+  if (typeof document === "undefined" || typeof document.createElement !== "function") {
+    return;
+  }
+
+  const textArea = document.createElement("textarea");
+  textArea.value = text;
+  textArea.setAttribute("readonly", "");
+  textArea.style.position = "absolute";
+  textArea.style.left = "-9999px";
+  document.body.appendChild(textArea);
+  textArea.select();
+
+  if (typeof document.execCommand === "function") {
+    document.execCommand("copy");
+  }
+
+  document.body.removeChild(textArea);
+};

assets/js/utils/script_loader.js

@@ -1,33 +0,0 @@
-export const loadScript = (src) =>
-  new Promise((resolve, reject) => {
-    const existing = document.querySelector(`script[src="${src}"]`);
-
-    if (existing) {
-      if (existing.dataset.loaded === "true") {
-        resolve();
-        return;
-      }
-
-      existing.addEventListener("load", () => resolve(), { once: true });
-      existing.addEventListener("error", () => reject(new Error(`Failed to load ${src}`)), {
-        once: true
-      });
-      return;
-    }
-
-    const script = document.createElement("script");
-    script.src = src;
-    script.async = true;
-    script.addEventListener(
-      "load",
-      () => {
-        script.dataset.loaded = "true";
-        resolve();
-      },
-      { once: true }
-    );
-    script.addEventListener("error", () => reject(new Error(`Failed to load ${src}`)), {
-      once: true
-    });
-    document.head.appendChild(script);
-  });

config/config.exs

@@ -4,7 +4,9 @@ config :bds,
   ecto_repos: [BDS.Repo]
 
 config :bds, BDS.Repo,
-  database: Path.expand("../priv/data/bds_dev.db", __DIR__),
+  database:
+    System.get_env("BDS_DATABASE_PATH") ||
+      Path.expand("~/Library/Application Support/BDS2/bds_dev.db"),
   pool_size: 5,
   journal_mode: :wal,
   busy_timeout: 15_000,
@@ -14,15 +16,22 @@ config :bds, BDS.Repo,
 
 config :bds, BDS.Application, desktop_adapter: :desktop
 
+# No secrets live in this file: the endpoint signing secret is generated per
+# boot (BDS.Application) and the AI secret master key comes from the OS
+# keyring (BDS.AI.SecretKey).
 config :bds, :desktop,
   port: 4010,
   window_size: {1280, 780},
   window_min_size: {800, 600},
-  title: "Blogging Desktop Server",
-  secret_key_base: "bds_desktop_shell_secret_key_base_64_chars_minimum_seed_value_001"
+  title: "Blogging Desktop Server"
+
+config :bds, :server, ssh_port: 2222
 
 config :bds, BDS.Desktop.Endpoint,
   url: [host: "127.0.0.1"],
+  # Any-port loopback origins: the remote-GUI SSH tunnel terminates on an
+  # ephemeral local port, so the websocket origin port varies per connect.
+  check_origin: ["//127.0.0.1", "//localhost"],
   adapter: Bandit.PhoenixAdapter,
   render_errors: [formats: [html: BDS.Desktop.ErrorHTML], layout: false],
   pubsub_server: BDS.PubSub,
@@ -51,6 +60,34 @@ config :esbuild,
       --external:/images/*
     ),
     env: %{"NODE_PATH" => Path.expand("../deps", __DIR__)}
+  ],
+  monaco: [
+    cd: Path.expand("../assets", __DIR__),
+    args: ~w(
+      js/monaco_entry.js
+      --bundle
+      --target=es2022
+      --format=esm
+      --outfile=../priv/static/assets/monaco.js
+      --loader:.ttf=dataurl
+    ),
+    env: %{"NODE_PATH" => Path.expand("../node_modules", __DIR__)}
+  ],
+  monaco_workers: [
+    cd: Path.expand("../assets", __DIR__),
+    args: ~w(
+      js/monaco_workers/editor.worker.js
+      js/monaco_workers/css.worker.js
+      js/monaco_workers/html.worker.js
+      js/monaco_workers/json.worker.js
+      js/monaco_workers/ts.worker.js
+      --bundle
+      --target=es2022
+      --format=esm
+      --outdir=../priv/static/assets/monaco
+      --loader:.ttf=dataurl
+    ),
+    env: %{"NODE_PATH" => Path.expand("../node_modules", __DIR__)}
   ]
 
 config :bds, :scripting,
@@ -63,7 +100,20 @@ config :bds, :scripting,
   transform_max_toasts_total: 20,
   transform_max_toast_length: 300
 
-config :bds, :chat, max_tool_rounds: 10
+# streaming: chat completions use SSE when the provider supports it (set to
+# false for OpenAI-compatible servers that reject the "stream" flag).
+# stream_emit_interval_ms throttles how often streamed content reaches the UI.
+# await_timeout_margin_ms is added on top of the per-request HTTP budget across
+# the bounded tool-call loop, so the caller never waits forever.
+config :bds, :chat,
+  max_tool_rounds: 10,
+  streaming: true,
+  stream_emit_interval_ms: 100,
+  await_timeout_margin_ms: 5_000
+
+config :bds, :git,
+  local_timeout_ms: 15_000,
+  network_timeout_ms: 120_000
 
 config :bds, :embeddings,
   backend: BDS.Embeddings.Backends.Neural,
@@ -80,7 +130,9 @@ config :bds, :embeddings,
 
 # Cache downloaded model files under the app data directory so they persist
 # across sessions (ModelCaching invariant). Overridden at runtime in prod.
-config :bumblebee, :cache_dir, Path.expand("../priv/data/models", __DIR__)
+config :bumblebee, :cache_dir,
+  System.get_env("BDS_MODEL_CACHE_DIR") ||
+    Path.expand("~/Library/Application Support/BDS2/models")
 
 config :logger, :console,
   format: "$time $metadata[$level] $message\n",

config/prod.exs

@@ -1,7 +1,6 @@
 import Config
 
 config :bds, BDS.Repo,
-  database: Path.expand("../priv/data/bds_prod.db", __DIR__),
   pool_size: 5,
   stacktrace: false,
   show_sensitive_data_on_connection_error: false

config/runtime.exs

@@ -1,13 +1,26 @@
 import Config
 
+# Headless boots (BDS_MODE=server/tui, or desktop mode without a graphical
+# display — issue #33) must neuter wx before the :desktop dependency
+# application starts it and crashes the VM. Local tui mode additionally
+# silences all other terminal writers (console logging goes to a file,
+# model-download progress bars are disabled) — the TUI owns the terminal
+# and every stray line scrolls its rendering up one row. Runtime config is
+# the only hook that runs before dependency applications start.
+BDS.Server.prepare_boot_env()
+
 if config_env() == :prod do
   database_path =
     System.get_env("BDS_DATABASE_PATH") ||
-      Path.expand("../priv/data/bds_prod.db", __DIR__)
+      Path.expand("~/Library/Application Support/BDS2/bds.db")
 
+  File.mkdir_p!(Path.dirname(database_path))
+
+  # Keep prod on the same modest SQLite pool as dev so WAL + busy_timeout see
+  # the same concurrency behavior in both environments unless explicitly tuned.
   config :bds, BDS.Repo,
     database: database_path,
-    pool_size: String.to_integer(System.get_env("POOL_SIZE") || "1")
+    pool_size: String.to_integer(System.get_env("POOL_SIZE") || "5")
 
   # Persist downloaded embedding model files alongside the database data dir.
   config :bumblebee,

config/test.exs

@@ -5,10 +5,17 @@ config :bds, BDS.Repo,
   pool: Ecto.Adapters.SQL.Sandbox,
   pool_size: 5,
   journal_mode: :wal,
-  busy_timeout: 15_000
+  # Desktop/LiveView tests can leave short-lived reader/writer processes
+  # draining after assertions. Give SQLite more time to wait out those locks
+  # during serialized suite runs instead of failing the next test setup.
+  busy_timeout: 60_000
 
 config :logger, level: :warning
 
+# Deterministic, test-only master key so secret round-trips never touch the
+# OS keyring (Keychain) or write key files on developer machines.
+config :bds, :ai_secret_key, "bds-test-only-ai-secret-key-not-used-outside-the-test-env"
+
 # Tests use the deterministic lexical stub backend so the suite stays offline
 # and never downloads the ~100 MB neural model.
 config :bds, :embeddings,

lib/bds/ai.ex

@@ -1,7 +1,15 @@
 defmodule BDS.AI do
   @moduledoc """
-  Public interface for AI features — endpoint configuration, secret management,
-  model catalog access, and dispatching chat and one-shot inference requests.
+  Stable public interface for AI features.
+
+  This facade owns the app-level AI state that other modules are expected to
+  depend on directly: endpoint configuration, secret management, airplane-mode
+  gating, and per-feature model preferences, alongside model catalog access and
+  dispatching chat and one-shot inference requests.
+
+  `BDS.AI.Catalog`, `BDS.AI.OneShot`, and `BDS.AI.Chat` are internal
+  implementation modules behind this boundary. Callers should treat `BDS.AI` as
+  the durable surface for AI behavior and configuration.
   """
 
   alias BDS.AI.Catalog
@@ -46,13 +54,21 @@ defmodule BDS.AI do
     model = MapUtils.attr(attrs, :model)
     api_key = MapUtils.attr(attrs, :api_key)
 
-    with :ok <- put_setting("ai.#{kind_key}.url", url),
-         :ok <- put_setting("ai.#{kind_key}.model", model),
-         :ok <- put_secret("ai.#{kind_key}.api_key", api_key, backend) do
+    with :ok <- put_or_delete_setting("ai.#{kind_key}.url", url),
+         :ok <- put_or_delete_setting("ai.#{kind_key}.model", model),
+         :ok <- put_or_delete_secret("ai.#{kind_key}.api_key", api_key, backend) do
       {:ok, %{kind: kind, url: url, api_key: api_key, model: model}}
     end
   end
 
+  # A nil field means "clear it" — writing nil into put_setting/2 would raise a
+  # FunctionClauseError and crash the caller (the preferences panel).
+  defp put_or_delete_setting(key, nil), do: delete_setting(key)
+  defp put_or_delete_setting(key, value) when is_binary(value), do: put_setting(key, value)
+
+  defp put_or_delete_secret(key, nil, _backend), do: delete_setting(encrypted_key(key))
+  defp put_or_delete_secret(key, value, backend), do: put_secret(key, value, backend)
+
   @spec get_endpoint(endpoint_kind(), keyword()) ::
           {:ok, endpoint() | nil} | {:error, term()}
   def get_endpoint(kind, opts \\ []) when is_atom(kind) and is_list(opts) do
@@ -111,6 +127,19 @@ defmodule BDS.AI do
     end
   end
 
+  @doc """
+  True when the airplane (local) endpoint has both a URL and a model
+  configured, so gated AI features can run against the local model.
+  """
+  @spec airplane_endpoint_configured?() :: boolean()
+  def airplane_endpoint_configured? do
+    present_setting?(get_setting("ai.airplane.url")) and
+      present_setting?(get_setting("ai.airplane.model"))
+  end
+
+  defp present_setting?(value) when is_binary(value), do: String.trim(value) != ""
+  defp present_setting?(_value), do: false
+
   @spec put_model_preference(atom(), String.t()) ::
           :ok | {:error, :unknown_model_preference | term()}
   def put_model_preference(key, model) when is_atom(key) and is_binary(model) do

lib/bds/ai/chat.ex

@@ -1,5 +1,11 @@
 defmodule BDS.AI.Chat do
-  @moduledoc false
+  @moduledoc """
+  Context for AI chat conversations: start, list, fetch, and delete
+  conversations, persist surface state, and resolve the effective chat model.
+
+  Automatic AI activity is gated by the app's airplane (offline) mode; callers
+  must respect that gating before invoking model-backed operations.
+  """
 
   import Ecto.Query
   require Logger
@@ -9,6 +15,7 @@ defmodule BDS.AI.Chat do
   alias BDS.AI.CatalogProvider
   alias BDS.AI.ChatConversation
   alias BDS.AI.ChatMessage
+  alias BDS.AI.ChatTitleGenerator
   alias BDS.AI.ChatTools
   alias BDS.AI.InFlight
   alias BDS.AI.OpenAICompatibleRuntime
@@ -24,16 +31,15 @@ defmodule BDS.AI.Chat do
 
   @default_system_prompt "You are the bDS AI backend. Be precise, prefer structured JSON when asked, and avoid inventing blog facts."
   @default_max_output_tokens 16_384
-  @title_max_output_tokens 256
-  @chat_title_max_length 30
   @chat_max_tool_rounds 10
+  @chat_await_timeout_margin_ms 5_000
   @default_context_window 128_000
 
   @spec start_chat(map()) :: {:ok, map()} | {:error, Ecto.Changeset.t()}
   def start_chat(attrs \\ %{}) when is_map(attrs) do
     now = Persistence.now_ms()
     model = MapUtils.attr(attrs, :model)
-    title = MapUtils.attr(attrs, :title) || generated_chat_title(model)
+    title = MapUtils.attr(attrs, :title) || ChatTitleGenerator.generated_chat_title(model)
 
     %ChatConversation{}
     |> ChatConversation.changeset(%{
@@ -105,12 +111,24 @@ defmodule BDS.AI.Chat do
         {:error, :not_found}
 
       %ChatConversation{} = conversation ->
+        Repo.transaction(fn ->
           Repo.delete_all(
             from message in ChatMessage, where: message.conversation_id == ^conversation_id
           )
 
+          case delete_chat_conversation_test_hook(conversation_id) do
+            :ok ->
               case Repo.delete(conversation) do
-          {:ok, _conversation} -> {:ok, :deleted}
+                {:ok, _conversation} -> :ok
+                {:error, reason} -> Repo.rollback(reason)
+              end
+
+            {:error, reason} ->
+              Repo.rollback(reason)
+          end
+        end)
+        |> case do
+          {:ok, :ok} -> {:ok, :deleted}
           {:error, reason} -> {:error, reason}
         end
     end
@@ -196,19 +214,13 @@ defmodule BDS.AI.Chat do
            }) do
       task =
         Task.Supervisor.async_nolink(BDS.Tasks.TaskSupervisor, fn ->
-          receive do
-            :sandbox_ready -> :ok
-          end
-
           do_send_chat_message(conversation, user_message, opts)
         end)
 
       InFlight.register(conversation.id, task.pid)
-      :ok = allow_repo_sandbox(task.pid)
-      send(task.pid, :sandbox_ready)
 
       try do
-        await_chat_task(task)
+        await_chat_task(task, chat_await_timeout_ms())
       after
         InFlight.unregister(conversation.id)
       end
@@ -423,11 +435,11 @@ defmodule BDS.AI.Chat do
     conversation = Repo.get!(ChatConversation, conversation_id)
 
     cond do
-      chat_user_message_count(conversation_id) < 1 ->
+      ChatTitleGenerator.chat_user_message_count(conversation_id) < 1 ->
         Logger.debug("Chat title generation skipped reason=:no_user_messages")
         {:ok, reply}
 
-      not generated_chat_title?(conversation.title, conversation.model) ->
+      not ChatTitleGenerator.generated_chat_title?(conversation.title, conversation.model) ->
         Logger.debug(
           "Chat title generation skipped reason=:conversation_already_titled title=#{inspect(conversation.title)}"
         )
@@ -437,7 +449,7 @@ defmodule BDS.AI.Chat do
       true ->
         Logger.debug("Chat title generation requested conversation_id=#{conversation_id}")
 
-        case generate_chat_title(user_content, opts) do
+        case ChatTitleGenerator.generate_chat_title(user_content, opts) do
           {:ok, title} when is_binary(title) and title != "" ->
             now = Persistence.now_ms()
 
@@ -458,87 +470,6 @@ defmodule BDS.AI.Chat do
     end
   end
 
-  defp generate_chat_title(user_content, opts) when is_binary(user_content) do
-    runtime = Keyword.get(opts, :runtime, OpenAICompatibleRuntime)
-
-    with {:ok, endpoint, model, mode} <- Runtime.resolve_target(:chat_title, opts),
-         :ok <- Runtime.validate_target(:chat_title, model, mode),
-         request <- build_chat_title_request(user_content, model),
-         {:ok, response} <-
-           runtime.generate(Runtime.endpoint_with_model(endpoint, model), request, opts) do
-      title = sanitize_chat_title(Map.get(response, :content))
-
-      if title == "" do
-        Logger.warning("Chat title generation returned an empty title",
-          model: model,
-          content: inspect(Map.get(response, :content)),
-          usage: inspect(Map.get(response, :usage))
-        )
-      end
-
-      {:ok, title}
-    else
-      {:error, reason} = error ->
-        Logger.warning("Chat title generation failed", reason: inspect(reason))
-        error
-
-      other ->
-        Logger.warning("Chat title generation failed", reason: inspect(other))
-        other
-    end
-  end
-
-  defp build_chat_title_request(user_content, model) do
-    %{
-      operation: :chat_title,
-      model: model,
-      max_output_tokens: @title_max_output_tokens,
-      messages: [
-        %{
-          "role" => "system",
-          "content" =>
-            "Generate an ultra-short title (2-3 words, max 25 characters) for this conversation. Focus ONLY on the topic. Ignore any capability disclaimers. Do not include reasoning. Output ONLY the title text."
-        },
-        %{"role" => "user", "content" => "Topic: #{String.slice(user_content, 0, 100)}"}
-      ]
-    }
-  end
-
-  defp sanitize_chat_title(title) when is_binary(title) do
-    title =
-      title
-      |> String.trim()
-      |> String.trim_leading("\"")
-      |> String.trim_leading("'")
-      |> String.trim_trailing("\"")
-      |> String.trim_trailing("'")
-      |> String.trim_trailing(".")
-      |> String.trim_trailing("!")
-      |> String.trim_trailing("?")
-
-    if String.length(title) > @chat_title_max_length do
-      String.slice(title, 0, @chat_title_max_length - 3) <> "..."
-    else
-      title
-    end
-  end
-
-  defp sanitize_chat_title(_title), do: ""
-
-  defp chat_user_message_count(conversation_id) do
-    Repo.aggregate(
-      from(message in ChatMessage,
-        where: message.conversation_id == ^conversation_id and message.role == :user
-      ),
-      :count,
-      :id
-    )
-  end
-
-  defp generated_chat_title?(title, model) do
-    title in [generated_chat_title(nil), generated_chat_title(model)]
-  end
-
   defp chat_round(
          _conversation,
          _messages,
@@ -565,52 +496,35 @@ defmodule BDS.AI.Chat do
          rounds_left
        ) do
     request = build_chat_request(conversation, messages, model, project_id, tools)
+    generate_opts = put_stream_callback(opts, conversation.id)
 
     with {:ok, response} <-
-           runtime.generate(Runtime.endpoint_with_model(endpoint, model), request, opts),
+           runtime.generate(Runtime.endpoint_with_model(endpoint, model), request, generate_opts),
          {:ok, assistant_message} <- persist_assistant_response(conversation.id, response),
          :ok <- touch_conversation(conversation.id) do
-      if is_binary(Map.get(response, :content)) and String.trim(Map.get(response, :content)) != "" do
-        notify_chat_event(
-          opts,
-          {:chat_streaming_content, conversation.id, Map.get(response, :content)}
-        )
-      end
+      notify_assistant_content(response, conversation.id, opts)
 
-      tool_calls = decode_tool_calls(Map.get(response, :tool_calls))
-
-      Enum.each(tool_calls, fn tool_call ->
-        notify_chat_event(opts, {:chat_tool_call, conversation.id, tool_call})
-      end)
-
-      cond do
-        tool_calls != [] and tools != [] ->
-          with {:ok, tool_messages} <-
-                 execute_tool_calls(conversation.id, tool_calls, project_id, opts),
-               updated_messages <- load_chat_messages(conversation.id),
-               {:ok, reply} <-
-                 chat_round(
-                   Repo.get!(ChatConversation, conversation.id),
-                   updated_messages,
+      response
+      |> Map.get(:tool_calls)
+      |> decode_tool_calls()
+      |> continue_chat_round(
+        conversation.id,
+        assistant_message,
         endpoint,
         model,
         project_id,
         tools,
         runtime,
         opts,
-                   rounds_left - 1
-                 ) do
-            {:ok, Map.put(reply, :tool_messages, tool_messages)}
+        rounds_left
+      )
+    end
   end
 
-        true ->
-          {:ok,
-           %{
-             conversation: format_conversation(Repo.get!(ChatConversation, conversation.id)),
-             assistant_message: format_chat_message(assistant_message),
-             tool_messages: []
-           }}
-      end
+  defp delete_chat_conversation_test_hook(conversation_id) do
+    case Application.get_env(:bds, :chat_delete_conversation_test_hook) do
+      hook when is_function(hook, 1) -> hook.(conversation_id)
+      _other -> :ok
     end
   end
 
@@ -658,6 +572,63 @@ defmodule BDS.AI.Chat do
     {:ok, tool_messages}
   end
 
+  defp continue_chat_round(
+         tool_calls,
+         conversation_id,
+         assistant_message,
+         endpoint,
+         model,
+         project_id,
+         tools,
+         runtime,
+         opts,
+         rounds_left
+       ) do
+    Enum.each(tool_calls, fn tool_call ->
+      notify_chat_event(opts, {:chat_tool_call, conversation_id, tool_call})
+    end)
+
+    if tool_calls != [] and tools != [] do
+      with {:ok, tool_messages} <- execute_tool_calls(conversation_id, tool_calls, project_id, opts),
+           updated_messages <- load_chat_messages(conversation_id),
+           {:ok, reply} <-
+             chat_round(
+               Repo.get!(ChatConversation, conversation_id),
+               updated_messages,
+               endpoint,
+               model,
+               project_id,
+               tools,
+               runtime,
+               opts,
+               rounds_left - 1
+             ) do
+        {:ok, Map.put(reply, :tool_messages, tool_messages)}
+      end
+    else
+      final_chat_reply(conversation_id, assistant_message)
+    end
+  end
+
+  defp final_chat_reply(conversation_id, assistant_message) do
+    {:ok,
+     %{
+       conversation: format_conversation(Repo.get!(ChatConversation, conversation_id)),
+       assistant_message: format_chat_message(assistant_message),
+       tool_messages: []
+     }}
+  end
+
+  defp notify_assistant_content(response, conversation_id, opts) do
+    content = Map.get(response, :content)
+
+    if is_binary(content) and String.trim(content) != "" do
+      notify_chat_event(opts, {:chat_streaming_content, conversation_id, content})
+    end
+
+    :ok
+  end
+
   defp build_chat_request(conversation, messages, model, project_id, tools) do
     system_message = %{"role" => "system", "content" => chat_system_prompt(project_id, tools)}
 
@@ -755,9 +726,20 @@ defmodule BDS.AI.Chat do
   # BoundedToolLoop: the tool-calling round count is capped by
   # config.chat_max_tool_rounds (falling back to the built-in default).
   defp chat_max_tool_rounds do
+    chat_config(:max_tool_rounds, @chat_max_tool_rounds)
+  end
+
+  defp chat_await_timeout_ms do
+    per_request_timeout_ms = BDS.AI.HttpClient.request_timeout_ms()
+
+    per_request_timeout_ms * (chat_max_tool_rounds() + 1) +
+      chat_config(:await_timeout_margin_ms, @chat_await_timeout_margin_ms)
+  end
+
+  defp chat_config(key, default) do
     :bds
     |> Application.get_env(:chat, [])
-    |> Keyword.get(:max_tool_rounds, @chat_max_tool_rounds)
+    |> Keyword.get(key, default)
   end
 
   defp chat_system_prompt(project_id, tools) do
@@ -824,9 +806,6 @@ defmodule BDS.AI.Chat do
     )
   end
 
-  defp generated_chat_title(nil), do: "New Chat"
-  defp generated_chat_title(model), do: "Chat with #{model}"
-
   defp load_chat_messages(conversation_id) do
     Repo.all(
       from message in ChatMessage,
@@ -852,7 +831,7 @@ defmodule BDS.AI.Chat do
     :ok
   end
 
-  defp await_chat_task(task) do
+  defp await_chat_task(task, timeout_ms) do
     ref = task.ref
 
     receive do
@@ -878,6 +857,10 @@ defmodule BDS.AI.Chat do
           _other ->
             {:error, :cancelled}
         end
+    after
+      timeout_ms ->
+        _ = Task.shutdown(task, 100)
+        {:error, :chat_timeout}
     end
   end
 
@@ -921,6 +904,26 @@ defmodule BDS.AI.Chat do
     end
   end
 
+  # When someone is listening for chat events, ask the runtime to stream:
+  # it emits cumulative content snapshots, which the editor renders with
+  # replace semantics. The full-content notify after each round stays the
+  # authoritative final state (and the only event for non-streaming runtimes).
+  defp put_stream_callback(opts, conversation_id) do
+    case Keyword.get(opts, :event_target) do
+      nil ->
+        opts
+
+      _target ->
+        Keyword.put(opts, :on_stream, fn %{content: content} ->
+          if is_binary(content) and String.trim(content) != "" do
+            notify_chat_event(opts, {:chat_streaming_content, conversation_id, content})
+          end
+
+          :ok
+        end)
+    end
+  end
+
   defp notify_chat_event(opts, event) do
     case Keyword.get(opts, :event_target) do
       pid when is_pid(pid) -> send(pid, event)
@@ -935,22 +938,8 @@ defmodule BDS.AI.Chat do
     Repo.one(from project in Project, where: project.is_active == true, select: project.id)
   end
 
-  defp allow_repo_sandbox(pid) when is_pid(pid) do
-    if Code.ensure_loaded?(Ecto.Adapters.SQL.Sandbox) do
-      try do
-        Ecto.Adapters.SQL.Sandbox.allow(BDS.Repo, self(), pid)
-      rescue
-        _error -> :ok
-      end
-    else
-      :ok
-    end
-
-    :ok
-  end
-
   defp encode_nullable(nil), do: nil
   defp encode_nullable(value), do: Jason.encode!(value)
 
-  defp blank?(value), do: value in [nil, ""]
+  defp blank?(value), do: BDS.Values.blank?(value)
 end

lib/bds/ai/chat_title_generator.ex

@@ -0,0 +1,99 @@
+defmodule BDS.AI.ChatTitleGenerator do
+  @moduledoc false
+
+  require Logger
+
+  alias BDS.AI.ChatMessage
+  alias BDS.AI.OpenAICompatibleRuntime
+  alias BDS.AI.Runtime
+  alias BDS.Repo
+
+  import Ecto.Query
+
+  @title_max_output_tokens 256
+  @chat_title_max_length 30
+
+  def generate_chat_title(user_content, opts) when is_binary(user_content) do
+    runtime = Keyword.get(opts, :runtime, OpenAICompatibleRuntime)
+
+    with {:ok, endpoint, model, mode} <- Runtime.resolve_target(:chat_title, opts),
+         :ok <- Runtime.validate_target(:chat_title, model, mode),
+         request <- build_chat_title_request(user_content, model),
+         {:ok, response} <-
+           runtime.generate(Runtime.endpoint_with_model(endpoint, model), request, opts) do
+      title = sanitize_chat_title(Map.get(response, :content))
+
+      if title == "" do
+        Logger.warning("Chat title generation returned an empty title",
+          model: model,
+          content: inspect(Map.get(response, :content)),
+          usage: inspect(Map.get(response, :usage))
+        )
+      end
+
+      {:ok, title}
+    else
+      {:error, reason} = error ->
+        Logger.warning("Chat title generation failed", reason: inspect(reason))
+        error
+
+      other ->
+        Logger.warning("Chat title generation failed", reason: inspect(other))
+        other
+    end
+  end
+
+  def build_chat_title_request(user_content, model) do
+    %{
+      operation: :chat_title,
+      model: model,
+      max_output_tokens: @title_max_output_tokens,
+      messages: [
+        %{
+          "role" => "system",
+          "content" =>
+            "Generate an ultra-short title (2-3 words, max 25 characters) for this conversation. Focus ONLY on the topic. Ignore any capability disclaimers. Do not include reasoning. Output ONLY the title text."
+        },
+        %{"role" => "user", "content" => "Topic: #{String.slice(user_content, 0, 100)}"}
+      ]
+    }
+  end
+
+  def sanitize_chat_title(title) when is_binary(title) do
+    title =
+      title
+      |> String.trim()
+      |> String.trim_leading("\"")
+      |> String.trim_leading("'")
+      |> String.trim_trailing("\"")
+      |> String.trim_trailing("'")
+      |> String.trim_trailing(".")
+      |> String.trim_trailing("!")
+      |> String.trim_trailing("?")
+
+    if String.length(title) > @chat_title_max_length do
+      String.slice(title, 0, @chat_title_max_length - 3) <> "..."
+    else
+      title
+    end
+  end
+
+  def sanitize_chat_title(_title), do: ""
+
+  def chat_user_message_count(conversation_id) do
+    Repo.aggregate(
+      from(message in ChatMessage,
+        where: message.conversation_id == ^conversation_id and message.role == :user
+      ),
+      :count,
+      :id
+    )
+  end
+
+  def generated_chat_title?(title, model) do
+    title in [generated_chat_title(nil), generated_chat_title(model)]
+  end
+
+  def generated_chat_title(nil), do: "New Chat"
+  def generated_chat_title(model), do: "Chat with #{model}"
+end

lib/bds/ai/chat_tool_query_helpers.ex

@@ -0,0 +1,49 @@
+defmodule BDS.AI.ChatToolQueryHelpers do
+  @moduledoc false
+
+  alias BDS.Search
+
+  def normalize_limit(value) when is_integer(value) and value > 0 and value <= 50, do: value
+  def normalize_limit(_value), do: 10
+
+  def normalize_offset(value) when is_integer(value) and value >= 0, do: value
+  def normalize_offset(_value), do: 0
+
+  def search_filters(arguments) do
+    %{}
+    |> BDS.MapUtils.maybe_put(:category, BDS.MapUtils.blank_to_nil(arguments["category"]))
+    |> BDS.MapUtils.maybe_put(:tags, BDS.MapUtils.blank_to_nil(arguments["tags"]))
+    |> BDS.MapUtils.maybe_put(:language, BDS.MapUtils.blank_to_nil(arguments["language"]))
+    |> BDS.MapUtils.maybe_put(
+      :missing_translation_language,
+      BDS.MapUtils.blank_to_nil(arguments["missingTranslationLanguage"])
+    )
+    |> BDS.MapUtils.maybe_put(:year, arguments["year"])
+    |> BDS.MapUtils.maybe_put(:month, arguments["month"])
+    |> BDS.MapUtils.maybe_put(:status, BDS.BoundedAtoms.post_status(arguments["status"]))
+    |> Map.put(:offset, normalize_offset(arguments["offset"]))
+    |> Map.put(:limit, normalize_limit(arguments["limit"]))
+  end
+
+  def search_all_counted_posts(project_id, arguments) do
+    filters = search_filters(arguments) |> Map.put(:offset, 0) |> Map.put(:limit, 1)
+    {:ok, %{total: total}} = Search.search_posts(project_id, "", filters)
+
+    filters = Map.put(filters, :limit, max(total, 1))
+    {:ok, result} = Search.search_posts(project_id, "", filters)
+
+    result
+  end
+
+  def search_result(project_id, query, filters, mapper) do
+    {:ok, result} = Search.search_posts(project_id, query, filters)
+
+    %{
+      posts: Enum.map(result.posts, mapper),
+      total: result.total,
+      offset: result.offset,
+      limit: result.limit,
+      has_more: result.offset + result.limit < result.total
+    }
+  end
+end

lib/bds/ai/chat_tool_schemas.ex

@@ -0,0 +1,350 @@
+defmodule BDS.AI.ChatToolSchemas do
+  @moduledoc false
+
+  def tool_spec(name, description, parameters) do
+    %{
+      "type" => "function",
+      "function" => %{
+        "name" => name,
+        "description" => description,
+        "parameters" => parameters
+      }
+    }
+  end
+
+  def limit_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "limit" => %{"type" => "integer", "minimum" => 1, "maximum" => 50}
+      }
+    }
+  end
+
+  def post_search_schema(require_query) do
+    schema = %{
+      "type" => "object",
+      "properties" => %{
+        "query" => %{"type" => "string"},
+        "status" => %{"type" => "string", "enum" => ["draft", "published", "archived"]},
+        "category" => %{"type" => "string"},
+        "tags" => %{"type" => "array", "items" => %{"type" => "string"}},
+        "language" => %{"type" => "string"},
+        "missingTranslationLanguage" => %{"type" => "string"},
+        "year" => %{"type" => "integer"},
+        "month" => %{"type" => "integer", "minimum" => 1, "maximum" => 12},
+        "limit" => %{"type" => "integer", "minimum" => 1, "maximum" => 50},
+        "offset" => %{"type" => "integer", "minimum" => 0}
+      }
+    }
+
+    if require_query, do: Map.put(schema, "required", ["query"]), else: schema
+  end
+
+  def count_posts_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "groupBy" => %{
+          "type" => "array",
+          "items" => %{
+            "type" => "string",
+            "enum" => ["year", "month", "tag", "category", "status"]
+          }
+        },
+        "year" => %{"type" => "integer"},
+        "month" => %{"type" => "integer", "minimum" => 1, "maximum" => 12},
+        "status" => %{"type" => "string", "enum" => ["draft", "published", "archived"]},
+        "category" => %{"type" => "string"},
+        "tags" => %{"type" => "array", "items" => %{"type" => "string"}}
+      },
+      "required" => ["groupBy"]
+    }
+  end
+
+  def post_id_schema do
+    %{
+      "type" => "object",
+      "properties" => %{"postId" => %{"type" => "string"}},
+      "required" => ["postId"]
+    }
+  end
+
+  def media_id_schema(extra_properties \\ %{}) do
+    %{
+      "type" => "object",
+      "properties" => Map.merge(%{"mediaId" => %{"type" => "string"}}, extra_properties),
+      "required" => ["mediaId"]
+    }
+  end
+
+  def update_post_metadata_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "postId" => %{"type" => "string"},
+        "title" => %{"type" => "string"},
+        "excerpt" => %{"type" => "string"},
+        "tags" => %{"type" => "array", "items" => %{"type" => "string"}},
+        "categories" => %{"type" => "array", "items" => %{"type" => "string"}}
+      },
+      "required" => ["postId"]
+    }
+  end
+
+  def update_media_metadata_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "mediaId" => %{"type" => "string"},
+        "title" => %{"type" => "string"},
+        "alt" => %{"type" => "string"},
+        "caption" => %{"type" => "string"},
+        "tags" => %{"type" => "array", "items" => %{"type" => "string"}}
+      },
+      "required" => ["mediaId"]
+    }
+  end
+
+  def render_table_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "title" => %{"type" => "string", "description" => "Optional table title"},
+        "columns" => %{
+          "type" => "array",
+          "items" => %{"type" => "string"},
+          "description" => "Column header names"
+        },
+        "rows" => %{
+          "type" => "array",
+          "items" => %{"type" => "array", "items" => %{"type" => "string"}},
+          "description" => "Table rows, each row is an array of cell values"
+        }
+      }
+    }
+  end
+
+  def render_chart_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "chartType" => %{
+          "type" => "string",
+          "enum" => ["bar", "stacked-bar", "line", "area", "pie", "donut", "heatmap"],
+          "description" =>
+            "The type of chart to render. Use stacked-bar for multi-segment bars. Use heatmap for grid/matrix visualizations."
+        },
+        "title" => %{"type" => "string", "description" => "Optional chart title"},
+        "series" => %{
+          "type" => "array",
+          "description" => "Array of data points.",
+          "items" => %{
+            "type" => "object",
+            "properties" => %{
+              "label" => %{"type" => "string", "description" => "Data point label"},
+              "value" => %{"type" => "number", "description" => "Data point value"},
+              "segments" => %{
+                "type" => "array",
+                "description" =>
+                  "Segments within this data point. Required for stacked-bar and heatmap charts.",
+                "items" => %{
+                  "type" => "object",
+                  "properties" => %{
+                    "label" => %{"type" => "string"},
+                    "value" => %{"type" => "number"}
+                  },
+                  "required" => ["label", "value"]
+                }
+              }
+            },
+            "required" => ["label"]
+          }
+        }
+      },
+      "required" => ["chartType", "series"]
+    }
+  end
+
+  def render_form_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "title" => %{"type" => "string", "description" => "Optional form title"},
+        "fields" => %{
+          "type" => "array",
+          "description" => "Form fields to display",
+          "items" => %{
+            "type" => "object",
+            "properties" => %{
+              "key" => %{"type" => "string", "description" => "Field identifier"},
+              "label" => %{"type" => "string", "description" => "Field label shown to user"},
+              "inputType" => %{
+                "type" => "string",
+                "enum" => ["text", "textarea", "select", "checkbox", "date", "number"],
+                "description" => "Type of input control"
+              },
+              "placeholder" => %{"type" => "string", "description" => "Placeholder text"},
+              "defaultValue" => %{"type" => "string", "description" => "Default value"},
+              "options" => %{
+                "type" => "array",
+                "description" => "Options for select fields",
+                "items" => %{
+                  "type" => "object",
+                  "properties" => %{
+                    "label" => %{"type" => "string"},
+                    "value" => %{"type" => "string"}
+                  }
+                }
+              },
+              "required" => %{"type" => "boolean", "description" => "Whether the field is required"}
+            },
+            "required" => ["key", "label", "inputType"]
+          }
+        },
+        "submitLabel" => %{"type" => "string", "description" => "Label for the submit button"},
+        "submitAction" => %{"type" => "string", "description" => "Action to dispatch on submit"}
+      }
+    }
+  end
+
+  def render_card_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "title" => %{"type" => "string", "description" => "Card title"},
+        "subtitle" => %{"type" => "string", "description" => "Optional subtitle"},
+        "body" => %{"type" => "string", "description" => "Card body text (supports markdown)"},
+        "actions" => %{
+          "type" => "array",
+          "description" => "Optional action buttons on the card",
+          "items" => %{
+            "type" => "object",
+            "properties" => %{
+              "label" => %{"type" => "string", "description" => "Button label"},
+              "action" => %{"type" => "string", "description" => "Action name to dispatch"},
+              "payload" => %{
+                "type" => "object",
+                "description" => "Optional action payload"
+              }
+            },
+            "required" => ["label", "action"]
+          }
+        }
+      }
+    }
+  end
+
+  def render_metric_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "label" => %{"type" => "string", "description" => "Metric label"},
+        "value" => %{"type" => "string", "description" => "Metric value (displayed prominently)"}
+      }
+    }
+  end
+
+  def render_list_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "title" => %{"type" => "string", "description" => "Optional list title"},
+        "items" => %{
+          "type" => "array",
+          "items" => %{"type" => "string"},
+          "description" => "List items"
+        }
+      }
+    }
+  end
+
+  def render_tabs_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "title" => %{"type" => "string", "description" => "Optional tabs title"},
+        "tabs" => %{
+          "type" => "array",
+          "description" => "Array of tabs",
+          "items" => %{
+            "type" => "object",
+            "properties" => %{
+              "label" => %{"type" => "string", "description" => "Tab label"},
+              "content" => %{
+                "type" => "array",
+                "description" => "Content items within the tab",
+                "items" => %{
+                  "type" => "object",
+                  "properties" => %{
+                    "type" => %{
+                      "type" => "string",
+                      "enum" => ["text", "metric", "list", "chart", "table"],
+                      "description" => "Content type"
+                    },
+                    "text" => %{"type" => "string", "description" => "Text content (for type text)"},
+                    "label" => %{"type" => "string", "description" => "Label (for type metric)"},
+                    "value" => %{"type" => "string", "description" => "Display value (for type metric)"},
+                    "title" => %{"type" => "string", "description" => "Title (for type list, chart, or table)"},
+                    "items" => %{
+                      "type" => "array",
+                      "items" => %{"type" => "string"},
+                      "description" => "Items (for type list)"
+                    },
+                    "chartType" => %{
+                      "type" => "string",
+                      "enum" => ["bar", "stacked-bar", "line", "area", "pie", "donut", "heatmap"],
+                      "description" => "Chart type (for type chart)"
+                    },
+                    "series" => %{
+                      "type" => "array",
+                      "description" => "Data series (for type chart)"
+                    },
+                    "columns" => %{
+                      "type" => "array",
+                      "items" => %{"type" => "string"},
+                      "description" => "Column headers (for type table)"
+                    },
+                    "rows" => %{
+                      "type" => "array",
+                      "items" => %{"type" => "array", "items" => %{"type" => "string"}},
+                      "description" => "Table rows (for type table)"
+                    }
+                  },
+                  "required" => ["type"]
+                }
+              }
+            },
+            "required" => ["label", "content"]
+          }
+        }
+      }
+    }
+  end
+
+  def render_mindmap_schema do
+    %{
+      "type" => "object",
+      "properties" => %{
+        "title" => %{"type" => "string", "description" => "Optional mind map title"},
+        "nodes" => %{
+          "type" => "array",
+          "description" => "Flat array of nodes. The first node is the root. Each node references children by ID.",
+          "items" => %{
+            "type" => "object",
+            "properties" => %{
+              "id" => %{"type" => "string", "description" => "Unique node identifier"},
+              "label" => %{"type" => "string", "description" => "Node label text"},
+              "children" => %{
+                "type" => "array",
+                "items" => %{"type" => "string"},
+                "description" => "IDs of child nodes"
+              }
+            },
+            "required" => ["id", "label"]
+          }
+        }
+      }
+    }
+  end
+end

lib/bds/ai/chat_tools.ex

@@ -4,6 +4,8 @@ defmodule BDS.AI.ChatTools do
   import Ecto.Query
 
   alias BDS.AI.Chat
+  alias BDS.AI.ChatToolQueryHelpers, as: QueryHelpers
+  alias BDS.AI.ChatToolSchemas, as: Schemas
   alias BDS.Media, as: MediaContext
   alias BDS.Media.Media
   alias BDS.MCP.Queries
@@ -12,7 +14,6 @@ defmodule BDS.AI.ChatTools do
   alias BDS.Posts.PostMedia
   alias BDS.Projects.Project
   alias BDS.Repo
-  alias BDS.Search
 
   @spec execute(String.t(), map(), String.t() | nil) :: map()
   def execute("blog_stats", _arguments, project_id) do
@@ -58,17 +59,14 @@ defmodule BDS.AI.ChatTools do
 
   def execute("search_posts", arguments, project_id) do
     project_id = project_id || active_project_id()
-    filters = search_filters(arguments)
+    filters = QueryHelpers.search_filters(arguments)
 
-    {:ok, result} = Search.search_posts(project_id, arguments["query"] || "", filters)
-
-    %{
-      posts: Enum.map(result.posts, &Queries.post_summary/1),
-      total: result.total,
-      offset: result.offset,
-      limit: result.limit,
-      has_more: result.offset + result.limit < result.total
-    }
+    QueryHelpers.search_result(
+      project_id,
+      arguments["query"] || "",
+      filters,
+      &Queries.post_summary/1
+    )
   end
 
   def execute("read_post_by_slug", arguments, project_id) do
@@ -83,41 +81,28 @@ defmodule BDS.AI.ChatTools do
   def execute("read_post", arguments, project_id) do
     project_id = project_id || active_project_id()
 
-    case Repo.get_by(Post,
-           id: arguments["postId"] || arguments["post_id"],
-           project_id: project_id
-         ) do
-      %Post{} = post -> %{post: Queries.post_detail(post)}
-      nil -> %{success: false, error: "not_found"}
-    end
+    with_post(arguments, project_id, %{success: false, error: "not_found"}, fn post ->
+      %{post: Queries.post_detail(post)}
+    end)
   end
 
   def execute("list_posts", arguments, project_id) do
     project_id = project_id || active_project_id()
-    limit = normalize_limit(arguments["limit"])
-    offset = normalize_offset(arguments["offset"])
-    filters = search_filters(arguments) |> Map.merge(%{limit: limit, offset: offset})
+    limit = QueryHelpers.normalize_limit(arguments["limit"])
+    offset = QueryHelpers.normalize_offset(arguments["offset"])
+    filters = QueryHelpers.search_filters(arguments) |> Map.merge(%{limit: limit, offset: offset})
 
-    {:ok, result} = Search.search_posts(project_id, "", filters)
-
-    %{
-      posts:
-        Enum.map(result.posts, fn post ->
+    QueryHelpers.search_result(project_id, "", filters, fn post ->
       post
       |> Queries.post_summary()
       |> Map.put("url", "/posts/#{post.slug}")
       |> Map.put("updated_at", post.updated_at)
-        end),
-      total: result.total,
-      offset: result.offset,
-      limit: result.limit,
-      has_more: result.offset + result.limit < result.total
-    }
+    end)
   end
 
   def execute("list_media", arguments, project_id) do
     project_id = project_id || active_project_id()
-    limit = normalize_limit(arguments["limit"])
+    limit = QueryHelpers.normalize_limit(arguments["limit"])
 
     Repo.all(
       from(media in Media,
@@ -138,13 +123,9 @@ defmodule BDS.AI.ChatTools do
   def execute("get_media", arguments, project_id) do
     project_id = project_id || active_project_id()
 
-    case Repo.get_by(Media,
-           id: arguments["mediaId"] || arguments["media_id"],
-           project_id: project_id
-         ) do
-      %Media{} = media -> %{media: media_summary(media)}
-      nil -> %{success: false, error: "not_found"}
-    end
+    with_media(arguments, project_id, %{success: false, error: "not_found"}, fn media ->
+      %{media: media_summary(media)}
+    end)
   end
 
   def execute("view_image", arguments, project_id) do
@@ -220,7 +201,7 @@ defmodule BDS.AI.ChatTools do
   def execute("count_posts", arguments, project_id) do
     project_id = project_id || active_project_id()
     group_by = List.wrap(arguments["groupBy"] || arguments["group_by"]) |> Enum.map(&to_string/1)
-    result = search_all_counted_posts(project_id, arguments)
+    result = QueryHelpers.search_all_counted_posts(project_id, arguments)
 
     groups =
       result.posts
@@ -235,51 +216,33 @@ defmodule BDS.AI.ChatTools do
   def execute("get_post_backlinks", arguments, project_id) do
     project_id = project_id || active_project_id()
 
-    case Repo.get_by(Post,
-           id: arguments["postId"] || arguments["post_id"],
-           project_id: project_id
-         ) do
-      %Post{} = post ->
+    with_post(arguments, project_id, %{success: false, error: "not_found"}, fn post ->
       %{success: true, post_id: post.id, linked_by: Queries.linked_posts(post.id, :incoming)}
-
-      nil ->
-        %{success: false, error: "not_found"}
-    end
+    end)
   end
 
   def execute("get_post_outlinks", arguments, project_id) do
     project_id = project_id || active_project_id()
 
-    case Repo.get_by(Post,
-           id: arguments["postId"] || arguments["post_id"],
-           project_id: project_id
-         ) do
-      %Post{} = post ->
+    with_post(arguments, project_id, %{success: false, error: "not_found"}, fn post ->
       %{success: true, post_id: post.id, links_to: Queries.linked_posts(post.id, :outgoing)}
-
-      nil ->
-        %{success: false, error: "not_found"}
-    end
+    end)
   end
 
   def execute("get_post_media", arguments, project_id) do
     project_id = project_id || active_project_id()
-    post_id = arguments["postId"] || arguments["post_id"]
 
-    case Repo.get_by(Post, id: post_id, project_id: project_id) do
-      %Post{} = post -> %{success: true, post_id: post.id, media: post_media(project_id, post.id)}
-      nil -> %{success: false, error: "not_found"}
-    end
+    with_post(arguments, project_id, %{success: false, error: "not_found"}, fn post ->
+      %{success: true, post_id: post.id, media: post_media(project_id, post.id)}
+    end)
   end
 
   def execute("get_media_posts", arguments, project_id) do
     project_id = project_id || active_project_id()
-    media_id = arguments["mediaId"] || arguments["media_id"]
 
-    case Repo.get_by(Media, id: media_id, project_id: project_id) do
-      %Media{} = media -> %{success: true, media_id: media.id, posts: media_posts(media.id)}
-      nil -> %{success: false, error: "not_found"}
-    end
+    with_media(arguments, project_id, %{success: false, error: "not_found"}, fn media ->
+      %{success: true, media_id: media.id, posts: media_posts(media.id)}
+    end)
   end
 
   def execute("render_table", arguments, _project_id) do
@@ -365,7 +328,7 @@ defmodule BDS.AI.ChatTools do
             %{
               name: "blog_stats",
               spec:
-                tool_spec("blog_stats", "Return aggregate blog statistics", %{
+                Schemas.tool_spec("blog_stats", "Return aggregate blog statistics", %{
                   "type" => "object",
                   "properties" => %{}
                 })
@@ -373,7 +336,7 @@ defmodule BDS.AI.ChatTools do
             %{
               name: "get_blog_stats",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "get_blog_stats",
                   "Get comprehensive blog statistics: total posts, media count, unique tag count, and unique category count. Use this first when you need to understand the scope of the data.",
                   %{"type" => "object", "properties" => %{}}
@@ -382,7 +345,7 @@ defmodule BDS.AI.ChatTools do
             %{
               name: "check_term",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "check_term",
                   "Check whether a term exists as a category, tag, or both. Returns post counts for each. Use before search_posts or list_posts when unsure whether a term is a category or tag.",
                   %{
@@ -395,16 +358,16 @@ defmodule BDS.AI.ChatTools do
             %{
               name: "search_posts",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "search_posts",
                   "Search blog posts using full-text search. Can filter by category, tags, language, missing translation language, year, month, or status. Returns paginated concrete post data with titles, slugs, tags, categories, backlinks, and links_to.",
-                  post_search_schema(true)
+                  Schemas.post_search_schema(true)
                 )
             },
             %{
               name: "read_post",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "read_post",
                   "Read full content and metadata of a specific blog post by ID. Includes backlinks, links_to, tags, categories, excerpt, status, language, and available languages.",
                   %{
@@ -417,7 +380,7 @@ defmodule BDS.AI.ChatTools do
             %{
               name: "read_post_by_slug",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "read_post_by_slug",
                   "Read full content and metadata of a specific blog post by slug. Includes backlinks, links_to, tags, categories, excerpt, status, language, and available languages.",
                   %{
@@ -430,37 +393,37 @@ defmodule BDS.AI.ChatTools do
             %{
               name: "list_posts",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "list_posts",
                   "List blog posts with optional filtering by status, category, tags, language, year, or month. Returns paginated concrete post data with titles, slugs, URLs, statuses, tags, categories, backlinks, and links_to. Use for recent, latest, top, or title-list requests.",
-                  post_search_schema(false)
+                  Schemas.post_search_schema(false)
                 )
             },
             %{
               name: "get_media",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "get_media",
                   "Get information about a specific media file by ID, including title, alt text, caption, tags, filename, MIME type, dimensions, and update time.",
-                  media_id_schema()
+                  Schemas.media_id_schema()
                 )
             },
             %{
               name: "list_media",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "list_media",
                   "List concrete media data in the active project, including titles, filenames, MIME types, and update times.",
-                  limit_schema()
+                  Schemas.limit_schema()
                 )
             },
             %{
               name: "view_image",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "view_image",
                   "View an image thumbnail as a local data URL for visual inspection. Only works with image media files.",
-                  media_id_schema(%{
+                  Schemas.media_id_schema(%{
                     "size" => %{"type" => "string", "enum" => ["small", "medium", "large"]}
                   })
                 )
@@ -468,25 +431,25 @@ defmodule BDS.AI.ChatTools do
             %{
               name: "update_post_metadata",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "update_post_metadata",
                   "Update metadata for a blog post: title, excerpt, tags, or categories. Does not update post body content.",
-                  update_post_metadata_schema()
+                  Schemas.update_post_metadata_schema()
                 )
             },
             %{
               name: "update_media_metadata",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "update_media_metadata",
                   "Update metadata for a media file: title, alt text, caption, or tags.",
-                  update_media_metadata_schema()
+                  Schemas.update_media_metadata_schema()
                 )
             },
             %{
               name: "list_tags",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "list_tags",
                   "List all tags used across blog posts with post counts.",
                   %{
@@ -498,7 +461,7 @@ defmodule BDS.AI.ChatTools do
             %{
               name: "list_categories",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "list_categories",
                   "List all categories used across blog posts with post counts.",
                   %{"type" => "object", "properties" => %{}}
@@ -507,46 +470,46 @@ defmodule BDS.AI.ChatTools do
             %{
               name: "count_posts",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "count_posts",
                   "Count posts grouped by dimensions such as year, month, tag, category, or status. Use for analytics, distributions, and heat maps without transferring full post content.",
-                  count_posts_schema()
+                  Schemas.count_posts_schema()
                 )
             },
             %{
               name: "get_post_backlinks",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "get_post_backlinks",
                   "Get all posts that link to a specific post.",
-                  post_id_schema()
+                  Schemas.post_id_schema()
                 )
             },
             %{
               name: "get_post_outlinks",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "get_post_outlinks",
                   "Get all posts that a specific post links to.",
-                  post_id_schema()
+                  Schemas.post_id_schema()
                 )
             },
             %{
               name: "get_post_media",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "get_post_media",
                   "Get media files linked to a specific post.",
-                  post_id_schema()
+                  Schemas.post_id_schema()
                 )
             },
             %{
               name: "get_media_posts",
               spec:
-                tool_spec(
+                Schemas.tool_spec(
                   "get_media_posts",
                   "Get posts that use a specific media file.",
-                  media_id_schema()
+                  Schemas.media_id_schema()
                 )
             }
           ]
@@ -559,73 +522,73 @@ defmodule BDS.AI.ChatTools do
           %{
             name: "render_card",
             spec:
-              tool_spec(
+              Schemas.tool_spec(
                 "render_card",
                 "Render an information card in the chat UI. Use this for displaying a summary, highlight, or actionable item.",
-                render_card_schema()
+                Schemas.render_card_schema()
               )
           },
           %{
             name: "render_table",
             spec:
-              tool_spec(
+              Schemas.tool_spec(
                 "render_table",
                 "Render a data table in the chat UI. Use this when the user asks for tabular data, comparisons, or structured information.",
-                render_table_schema()
+                Schemas.render_table_schema()
               )
           },
           %{
             name: "render_chart",
             spec:
-              tool_spec(
+              Schemas.tool_spec(
                 "render_chart",
                 "Render an interactive chart in the chat UI. Use this when the user asks for a chart, graph, or data visualization. Supports bar, stacked-bar, line, area, pie, donut, and heatmap charts. Use stacked-bar for multi-segment bars and heatmap for grid/matrix visualizations.",
-                render_chart_schema()
+                Schemas.render_chart_schema()
               )
           },
           %{
             name: "render_form",
             spec:
-              tool_spec(
+              Schemas.tool_spec(
                 "render_form",
                 "Render an interactive form in the chat UI. Use this when you need to collect structured input from the user.",
-                render_form_schema()
+                Schemas.render_form_schema()
               )
           },
           %{
             name: "render_metric",
             spec:
-              tool_spec(
+              Schemas.tool_spec(
                 "render_metric",
                 "Render a single metric/KPI display in the chat UI. Use this for showing a single important value with a label.",
-                render_metric_schema()
+                Schemas.render_metric_schema()
               )
           },
           %{
             name: "render_list",
             spec:
-              tool_spec(
+              Schemas.tool_spec(
                 "render_list",
                 "Render a list of items in the chat UI. Use this for displaying bullet-point style lists, checklists, or simple enumerations.",
-                render_list_schema()
+                Schemas.render_list_schema()
               )
           },
           %{
             name: "render_tabs",
             spec:
-              tool_spec(
+              Schemas.tool_spec(
                 "render_tabs",
                 "Render a tabbed interface in the chat UI. Use this to organize information into multiple tabs that the user can switch between.",
-                render_tabs_schema()
+                Schemas.render_tabs_schema()
               )
           },
           %{
             name: "render_mindmap",
             spec:
-              tool_spec(
+              Schemas.tool_spec(
                 "render_mindmap",
                 "Render a mind map diagram in the chat UI. Use this when the user asks for a mind map, concept map, topic tree, brainstorming diagram, or hierarchical overview of ideas.",
-                render_mindmap_schema()
+                Schemas.render_mindmap_schema()
               )
           }
         ]
@@ -634,383 +597,26 @@ defmodule BDS.AI.ChatTools do
     end
   end
 
-  defp tool_spec(name, description, parameters) do
-    %{
-      "type" => "function",
-      "function" => %{
-        "name" => name,
-        "description" => description,
-        "parameters" => parameters
-      }
-    }
+  defp with_post(arguments, project_id, not_found_result, success_fun) do
+    case Repo.get_by(Post,
+           id: arguments["postId"] || arguments["post_id"],
+           project_id: project_id
+         ) do
+      %Post{} = post -> success_fun.(post)
+      nil -> not_found_result
+    end
   end
 
-  defp limit_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "limit" => %{"type" => "integer", "minimum" => 1, "maximum" => 50}
-      }
-    }
+  defp with_media(arguments, project_id, not_found_result, success_fun) do
+    case Repo.get_by(Media,
+           id: arguments["mediaId"] || arguments["media_id"],
+           project_id: project_id
+         ) do
+      %Media{} = media -> success_fun.(media)
+      nil -> not_found_result
     end
-
-  defp post_search_schema(require_query) do
-    schema = %{
-      "type" => "object",
-      "properties" => %{
-        "query" => %{"type" => "string"},
-        "status" => %{"type" => "string", "enum" => ["draft", "published", "archived"]},
-        "category" => %{"type" => "string"},
-        "tags" => %{"type" => "array", "items" => %{"type" => "string"}},
-        "language" => %{"type" => "string"},
-        "missingTranslationLanguage" => %{"type" => "string"},
-        "year" => %{"type" => "integer"},
-        "month" => %{"type" => "integer", "minimum" => 1, "maximum" => 12},
-        "limit" => %{"type" => "integer", "minimum" => 1, "maximum" => 50},
-        "offset" => %{"type" => "integer", "minimum" => 0}
-      }
-    }
-
-    if require_query, do: Map.put(schema, "required", ["query"]), else: schema
   end
 
-  defp count_posts_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "groupBy" => %{
-          "type" => "array",
-          "items" => %{
-            "type" => "string",
-            "enum" => ["year", "month", "tag", "category", "status"]
-          }
-        },
-        "year" => %{"type" => "integer"},
-        "month" => %{"type" => "integer", "minimum" => 1, "maximum" => 12},
-        "status" => %{"type" => "string", "enum" => ["draft", "published", "archived"]},
-        "category" => %{"type" => "string"},
-        "tags" => %{"type" => "array", "items" => %{"type" => "string"}}
-      },
-      "required" => ["groupBy"]
-    }
-  end
-
-  defp post_id_schema do
-    %{
-      "type" => "object",
-      "properties" => %{"postId" => %{"type" => "string"}},
-      "required" => ["postId"]
-    }
-  end
-
-  defp media_id_schema(extra_properties \\ %{}) do
-    %{
-      "type" => "object",
-      "properties" => Map.merge(%{"mediaId" => %{"type" => "string"}}, extra_properties),
-      "required" => ["mediaId"]
-    }
-  end
-
-  defp update_post_metadata_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "postId" => %{"type" => "string"},
-        "title" => %{"type" => "string"},
-        "excerpt" => %{"type" => "string"},
-        "tags" => %{"type" => "array", "items" => %{"type" => "string"}},
-        "categories" => %{"type" => "array", "items" => %{"type" => "string"}}
-      },
-      "required" => ["postId"]
-    }
-  end
-
-  defp update_media_metadata_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "mediaId" => %{"type" => "string"},
-        "title" => %{"type" => "string"},
-        "alt" => %{"type" => "string"},
-        "caption" => %{"type" => "string"},
-        "tags" => %{"type" => "array", "items" => %{"type" => "string"}}
-      },
-      "required" => ["mediaId"]
-    }
-  end
-
-  defp render_table_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "title" => %{"type" => "string", "description" => "Optional table title"},
-        "columns" => %{
-          "type" => "array",
-          "items" => %{"type" => "string"},
-          "description" => "Column header names"
-        },
-        "rows" => %{
-          "type" => "array",
-          "items" => %{"type" => "array", "items" => %{"type" => "string"}},
-          "description" => "Table rows, each row is an array of cell values"
-        }
-      }
-    }
-  end
-
-  defp render_chart_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "chartType" => %{
-          "type" => "string",
-          "enum" => ["bar", "stacked-bar", "line", "area", "pie", "donut", "heatmap"],
-          "description" =>
-            "The type of chart to render. Use stacked-bar for multi-segment bars. Use heatmap for grid/matrix visualizations."
-        },
-        "title" => %{"type" => "string", "description" => "Optional chart title"},
-        "series" => %{
-          "type" => "array",
-          "description" => "Array of data points.",
-          "items" => %{
-            "type" => "object",
-            "properties" => %{
-              "label" => %{"type" => "string", "description" => "Data point label"},
-              "value" => %{"type" => "number", "description" => "Data point value"},
-              "segments" => %{
-                "type" => "array",
-                "description" =>
-                  "Segments within this data point. Required for stacked-bar and heatmap charts.",
-                "items" => %{
-                  "type" => "object",
-                  "properties" => %{
-                    "label" => %{"type" => "string"},
-                    "value" => %{"type" => "number"}
-                  },
-                  "required" => ["label", "value"]
-                }
-              }
-            },
-            "required" => ["label"]
-          }
-        }
-      },
-      "required" => ["chartType", "series"]
-    }
-  end
-
-  defp render_form_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "title" => %{"type" => "string", "description" => "Optional form title"},
-        "fields" => %{
-          "type" => "array",
-          "description" => "Form fields to display",
-          "items" => %{
-            "type" => "object",
-            "properties" => %{
-              "key" => %{"type" => "string", "description" => "Field identifier"},
-              "label" => %{"type" => "string", "description" => "Field label shown to user"},
-              "inputType" => %{
-                "type" => "string",
-                "enum" => ["text", "textarea", "select", "checkbox", "date", "number"],
-                "description" => "Type of input control"
-              },
-              "placeholder" => %{"type" => "string", "description" => "Placeholder text"},
-              "defaultValue" => %{"type" => "string", "description" => "Default value"},
-              "options" => %{
-                "type" => "array",
-                "description" => "Options for select fields",
-                "items" => %{
-                  "type" => "object",
-                  "properties" => %{
-                    "label" => %{"type" => "string"},
-                    "value" => %{"type" => "string"}
-                  }
-                }
-              },
-              "required" => %{"type" => "boolean", "description" => "Whether the field is required"}
-            },
-            "required" => ["key", "label", "inputType"]
-          }
-        },
-        "submitLabel" => %{"type" => "string", "description" => "Label for the submit button"},
-        "submitAction" => %{"type" => "string", "description" => "Action to dispatch on submit"}
-      }
-    }
-  end
-
-  defp render_card_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "title" => %{"type" => "string", "description" => "Card title"},
-        "subtitle" => %{"type" => "string", "description" => "Optional subtitle"},
-        "body" => %{"type" => "string", "description" => "Card body text (supports markdown)"},
-        "actions" => %{
-          "type" => "array",
-          "description" => "Optional action buttons on the card",
-          "items" => %{
-            "type" => "object",
-            "properties" => %{
-              "label" => %{"type" => "string", "description" => "Button label"},
-              "action" => %{"type" => "string", "description" => "Action name to dispatch"},
-              "payload" => %{
-                "type" => "object",
-                "description" => "Optional action payload"
-              }
-            },
-            "required" => ["label", "action"]
-          }
-        }
-      }
-    }
-  end
-
-  defp render_metric_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "label" => %{"type" => "string", "description" => "Metric label"},
-        "value" => %{"type" => "string", "description" => "Metric value (displayed prominently)"}
-      }
-    }
-  end
-
-  defp render_list_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "title" => %{"type" => "string", "description" => "Optional list title"},
-        "items" => %{
-          "type" => "array",
-          "items" => %{"type" => "string"},
-          "description" => "List items"
-        }
-      }
-    }
-  end
-
-  defp render_tabs_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "title" => %{"type" => "string", "description" => "Optional tabs title"},
-        "tabs" => %{
-          "type" => "array",
-          "description" => "Array of tabs",
-          "items" => %{
-            "type" => "object",
-            "properties" => %{
-              "label" => %{"type" => "string", "description" => "Tab label"},
-              "content" => %{
-                "type" => "array",
-                "description" => "Content items within the tab",
-                "items" => %{
-                  "type" => "object",
-                  "properties" => %{
-                    "type" => %{
-                      "type" => "string",
-                      "enum" => ["text", "metric", "list", "chart", "table"],
-                      "description" => "Content type"
-                    },
-                    "text" => %{"type" => "string", "description" => "Text content (for type text)"},
-                    "label" => %{"type" => "string", "description" => "Label (for type metric)"},
-                    "value" => %{"type" => "string", "description" => "Display value (for type metric)"},
-                    "title" => %{"type" => "string", "description" => "Title (for type list, chart, or table)"},
-                    "items" => %{
-                      "type" => "array", "items" => %{"type" => "string"},
-                      "description" => "Items (for type list)"
-                    },
-                    "chartType" => %{
-                      "type" => "string",
-                      "enum" => ["bar", "stacked-bar", "line", "area", "pie", "donut", "heatmap"],
-                      "description" => "Chart type (for type chart)"
-                    },
-                    "series" => %{
-                      "type" => "array",
-                      "description" => "Data series (for type chart)"
-                    },
-                    "columns" => %{
-                      "type" => "array", "items" => %{"type" => "string"},
-                      "description" => "Column headers (for type table)"
-                    },
-                    "rows" => %{
-                      "type" => "array", "items" => %{"type" => "array", "items" => %{"type" => "string"}},
-                      "description" => "Table rows (for type table)"
-                    }
-                  },
-                  "required" => ["type"]
-                }
-              }
-            },
-            "required" => ["label", "content"]
-          }
-        }
-      }
-    }
-  end
-
-  defp render_mindmap_schema do
-    %{
-      "type" => "object",
-      "properties" => %{
-        "title" => %{"type" => "string", "description" => "Optional mind map title"},
-        "nodes" => %{
-          "type" => "array",
-          "description" => "Flat array of nodes. The first node is the root. Each node references children by ID.",
-          "items" => %{
-            "type" => "object",
-            "properties" => %{
-              "id" => %{"type" => "string", "description" => "Unique node identifier"},
-              "label" => %{"type" => "string", "description" => "Node label text"},
-              "children" => %{
-                "type" => "array",
-                "items" => %{"type" => "string"},
-                "description" => "IDs of child nodes"
-              }
-            },
-            "required" => ["id", "label"]
-          }
-        }
-      }
-    }
-  end
-
-  defp normalize_limit(value) when is_integer(value) and value > 0 and value <= 50, do: value
-  defp normalize_limit(_value), do: 10
-
-  defp normalize_offset(value) when is_integer(value) and value >= 0, do: value
-  defp normalize_offset(_value), do: 0
-
-  defp search_filters(arguments) do
-    %{}
-    |> maybe_put(:category, arguments["category"])
-    |> maybe_put(:tags, arguments["tags"])
-    |> maybe_put(:language, arguments["language"])
-    |> maybe_put(:missing_translation_language, arguments["missingTranslationLanguage"])
-    |> maybe_put(:year, arguments["year"])
-    |> maybe_put(:month, arguments["month"])
-    |> maybe_put(:status, BDS.BoundedAtoms.post_status(arguments["status"]))
-    |> Map.put(:offset, normalize_offset(arguments["offset"]))
-    |> Map.put(:limit, normalize_limit(arguments["limit"]))
-  end
-
-  defp search_all_counted_posts(project_id, arguments) do
-    filters = search_filters(arguments) |> Map.put(:offset, 0) |> Map.put(:limit, 1)
-    {:ok, %{total: total}} = Search.search_posts(project_id, "", filters)
-
-    filters = Map.put(filters, :limit, max(total, 1))
-    {:ok, result} = Search.search_posts(project_id, "", filters)
-
-    result
-  end
-
-  defp maybe_put(map, _key, nil), do: map
-  defp maybe_put(map, _key, ""), do: map
-  defp maybe_put(map, key, value), do: Map.put(map, key, value)
-
   defp counted_terms(project_id, field) do
     Repo.all(
       from post in Post, where: post.project_id == ^project_id, select: field(post, ^field)
@@ -1024,7 +630,11 @@ defmodule BDS.AI.ChatTools do
 
   defp metadata_attrs(arguments, keys) do
     Enum.reduce(keys, %{}, fn key, acc ->
-      maybe_put(acc, BDS.MapUtils.safe_atomize_key(key), arguments[key])
+      BDS.MapUtils.maybe_put(
+        acc,
+        BDS.MapUtils.safe_atomize_key(key),
+        BDS.MapUtils.blank_to_nil(arguments[key])
+      )
     end)
   end
 

lib/bds/ai/http_client.ex

@@ -1,58 +1,150 @@
 defmodule BDS.AI.HttpClient do
-  @moduledoc false
+  @moduledoc """
+  Req-based HTTP client for AI endpoints.
 
+  Replaces the previous `:httpc` wrapper with explicit connect/receive
+  timeouts, TLS verification via Req's defaults, and transient retries for
+  idempotent GETs only — POSTs (chat completions) are never retried.
+
+  The response contract is unchanged: `{:ok, %{status, headers, body}}` with
+  downcased single-valued header names and the body as a raw binary (callers
+  decode JSON themselves), or `{:error, reason}` where transport failures
+  surface as plain reason atoms such as `:timeout` or `:econnrefused`.
+
+  Config (`config :bds, BDS.AI.HttpClient`):
+
+    * `:connect_timeout_ms` — TCP/TLS connect budget (default 5_000)
+    * `:receive_timeout_ms` — response budget (default 120_000; generous
+      because local LLM completions are slow)
+    * `:get_max_retries` — transient retries for GETs (default 2)
+    * `:retry_delay_ms` — constant delay between retries (default 500)
+  """
+
+  @default_connect_timeout_ms 5_000
+  @default_receive_timeout_ms 120_000
+  @default_get_max_retries 2
+  @default_retry_delay_ms 500
+
+  @spec request_timeout_ms() :: pos_integer()
+  def request_timeout_ms do
+    max(
+      config(:connect_timeout_ms, @default_connect_timeout_ms),
+      config(:receive_timeout_ms, @default_receive_timeout_ms)
+    )
+  end
+
+  @spec get(String.t(), %{String.t() => String.t()}) ::
+          {:ok, %{status: non_neg_integer(), headers: map(), body: binary()}} | {:error, term()}
   def get(url, headers) when is_binary(url) and is_map(headers) do
-    request =
-      {String.to_charlist(url),
-       Enum.map(headers, fn {key, value} ->
-         {String.to_charlist(key), String.to_charlist(value)}
-       end)}
-
-    :inets.start()
-    :ssl.start()
-
-    case :httpc.request(:get, request, [], body_format: :binary) do
-      {:ok, {{_version, status, _reason}, response_headers, body}} ->
-        {:ok,
-         %{
-           status: status,
-           headers: normalize_headers(response_headers),
-           body: body
-         }}
-
-      {:error, reason} ->
-        {:error, reason}
-    end
+    [
+      method: :get,
+      url: url,
+      headers: headers,
+      retry: :transient,
+      max_retries: config(:get_max_retries, @default_get_max_retries),
+      retry_delay: fn _retry_count -> config(:retry_delay_ms, @default_retry_delay_ms) end,
+      retry_log_level: false
+    ]
+    |> Keyword.merge(base_options())
+    |> Req.request()
+    |> normalize_result()
   end
 
+  @spec post(String.t(), %{String.t() => String.t()}, binary()) ::
+          {:ok, %{status: non_neg_integer(), headers: map(), body: binary()}} | {:error, term()}
   def post(url, headers, body)
       when is_binary(url) and is_map(headers) and is_binary(body) do
-    request =
-      {String.to_charlist(url),
-       Enum.map(headers, fn {key, value} ->
-         {String.to_charlist(key), String.to_charlist(value)}
-       end), ~c"application/json", body}
+    [
+      method: :post,
+      url: url,
+      headers: headers,
+      body: body,
+      # Completions are not idempotent; a retry could bill or generate twice.
+      retry: false
+    ]
+    |> Keyword.merge(base_options())
+    |> Req.request()
+    |> normalize_result()
+  end
 
-    :inets.start()
-    :ssl.start()
+  @doc """
+  Streaming POST: body chunks of a 200 response are folded into `acc` via
+  `reducer.(chunk, acc)` as they arrive; non-200 bodies are collected whole
+  for error reporting. Returns the final accumulator alongside the response.
 
-    case :httpc.request(:post, request, [], body_format: :binary) do
-      {:ok, {{_version, status, _reason}, response_headers, response_body}} ->
-        {:ok,
-         %{
-           status: status,
-           headers: normalize_headers(response_headers),
-           body: response_body
-         }}
+  Never retried (same reasoning as `post/3`), and `accept-encoding` is
+  disabled so event-stream chunks arrive uncompressed. The request runs in
+  the calling process — killing that process aborts the underlying
+  connection, which is what makes mid-stream chat cancellation work.
+  """
+  @spec post_stream(String.t(), %{String.t() => String.t()}, binary(), acc, (binary(), acc ->
+                                                                               acc)) ::
+          {:ok, %{status: non_neg_integer(), headers: map(), body: binary()}, acc}
+          | {:error, term()}
+        when acc: term()
+  def post_stream(url, headers, body, acc, reducer)
+      when is_binary(url) and is_map(headers) and is_binary(body) and is_function(reducer, 2) do
+    into = fn {:data, data}, {req, resp} ->
+      resp =
+        if resp.status == 200 do
+          next_acc = reducer.(data, Req.Response.get_private(resp, :bds_stream_acc, acc))
+          Req.Response.put_private(resp, :bds_stream_acc, next_acc)
+        else
+          %{resp | body: collected_body(resp.body) <> data}
+        end
+
+      {:cont, {req, resp}}
+    end
+
+    [
+      method: :post,
+      url: url,
+      headers: headers,
+      body: body,
+      retry: false,
+      compressed: false,
+      into: into
+    ]
+    |> Keyword.merge(base_options())
+    |> Req.request()
+    |> case do
+      {:ok, %Req.Response{} = resp} ->
+        {:ok, %{status: resp.status, headers: normalize_headers(resp.headers), body: collected_body(resp.body)},
+         Req.Response.get_private(resp, :bds_stream_acc, acc)}
+
+      {:error, %Req.TransportError{reason: reason}} ->
+        {:error, reason}
 
       {:error, reason} ->
         {:error, reason}
     end
   end
 
+  defp collected_body(body) when is_binary(body), do: body
+  defp collected_body(_body), do: ""
+
+  defp base_options do
+    [
+      connect_options: [timeout: config(:connect_timeout_ms, @default_connect_timeout_ms)],
+      receive_timeout: config(:receive_timeout_ms, @default_receive_timeout_ms),
+      # Callers parse the body themselves; keep it a raw binary.
+      decode_body: false
+    ]
+  end
+
+  defp normalize_result({:ok, %Req.Response{status: status, headers: headers, body: body}}) do
+    {:ok, %{status: status, headers: normalize_headers(headers), body: body}}
+  end
+
+  defp normalize_result({:error, %Req.TransportError{reason: reason}}), do: {:error, reason}
+  defp normalize_result({:error, reason}), do: {:error, reason}
+
+  # Req header names are already downcased; values arrive as lists.
   defp normalize_headers(headers) do
-    Enum.into(headers, %{}, fn {key, value} ->
-      {key |> to_string() |> String.downcase(), to_string(value)}
-    end)
+    Map.new(headers, fn {name, values} -> {name, Enum.join(List.wrap(values), ", ")} end)
+  end
+
+  defp config(key, default) do
+    Application.get_env(:bds, __MODULE__, []) |> Keyword.get(key, default)
   end
 end

lib/bds/ai/in_flight.ex

@@ -1,29 +1,38 @@
 defmodule BDS.AI.InFlight do
   @moduledoc false
 
+  # Registry of in-flight chat tasks keyed by conversation id. The named ETS
+  # table is owned by this supervised GenServer (started from the application
+  # supervision tree), so registrations survive the exit of the registering
+  # process and there is no creation race between concurrent first callers.
+  use GenServer
+
   @table :bds_ai_in_flight
 
+  def start_link(opts) do
+    GenServer.start_link(__MODULE__, opts, name: __MODULE__)
+  end
+
+  @impl true
+  def init(_opts) do
+    table = :ets.new(@table, [:named_table, :public, :set, read_concurrency: true])
+    {:ok, table}
+  end
+
   def register(conversation_id, pid) when is_binary(conversation_id) and is_pid(pid) do
-    :ets.insert(table(), {conversation_id, pid})
+    :ets.insert(@table, {conversation_id, pid})
     :ok
   end
 
   def unregister(conversation_id) when is_binary(conversation_id) do
-    :ets.delete(table(), conversation_id)
+    :ets.delete(@table, conversation_id)
     :ok
   end
 
   def lookup(conversation_id) when is_binary(conversation_id) do
-    case :ets.lookup(table(), conversation_id) do
+    case :ets.lookup(@table, conversation_id) do
       [{^conversation_id, pid}] -> pid
       _other -> nil
     end
   end
-
-  defp table do
-    case :ets.whereis(@table) do
-      :undefined -> :ets.new(@table, [:named_table, :public, :set, read_concurrency: true])
-      table -> table
-    end
-  end
 end

lib/bds/ai/json_content.ex

@@ -0,0 +1,42 @@
+defmodule BDS.AI.JsonContent do
+  @moduledoc """
+  Decodes JSON object payloads from model responses, tolerating the markdown
+  code fences and surrounding prose that smaller (local) models often emit
+  instead of bare JSON.
+  """
+
+  @fence_pattern ~r/```(?:json)?\s*\n?(.*?)```/is
+
+  @spec decode(term()) :: map() | nil
+  def decode(content) when is_binary(content) do
+    decode_strict(content) || decode_fenced(content) || decode_embedded_object(content)
+  end
+
+  def decode(_content), do: nil
+
+  defp decode_strict(content) do
+    case Jason.decode(content) do
+      {:ok, decoded} when is_map(decoded) -> decoded
+      _other -> nil
+    end
+  end
+
+  defp decode_fenced(content) do
+    case Regex.run(@fence_pattern, content, capture: :all_but_first) do
+      [inner] -> decode_strict(String.trim(inner)) || decode_embedded_object(inner)
+      _no_fence -> nil
+    end
+  end
+
+  defp decode_embedded_object(content) do
+    with {start, _length} <- :binary.match(content, "{"),
+         [{last, _} | _] <- content |> :binary.matches("}") |> Enum.take(-1),
+         true <- last > start do
+      content
+      |> binary_part(start, last - start + 1)
+      |> decode_strict()
+    else
+      _no_object -> nil
+    end
+  end
+end

lib/bds/ai/one_shot.ex

@@ -4,6 +4,7 @@ defmodule BDS.AI.OneShot do
   require Logger
 
   alias BDS.AI.Chat
+  alias BDS.AI.JsonContent
   alias BDS.AI.OpenAICompatibleRuntime
   alias BDS.AI.Runtime
   alias BDS.Media.Media
@@ -166,28 +167,13 @@ defmodule BDS.AI.OneShot do
     end
   end
 
-  defp run_one_shot(:analyze_image = operation, payload, opts, formatter) do
-    runtime = Keyword.get(opts, :runtime, OpenAICompatibleRuntime)
-
-    with {:ok, endpoint, model, mode} <- Runtime.resolve_target(operation, opts),
-         :ok <- Runtime.validate_target(operation, model, mode),
-         {:ok, payload} <- resolve_image_data_url(payload),
-         request <- build_one_shot_request(operation, payload, model, opts),
-         {:ok, response} <-
-           runtime.generate(Runtime.endpoint_with_model(endpoint, model), request, opts),
-         {:ok, json} <- extract_json_response(response),
-         usage <- Chat.normalize_usage(response.usage),
-         {:ok, result} <- formatter.(json, usage) do
-      {:ok, result}
-    end
-  end
-
   defp run_one_shot(operation, payload, opts, formatter) do
     runtime = Keyword.get(opts, :runtime, OpenAICompatibleRuntime)
 
     with {:ok, endpoint, model, mode} <- Runtime.resolve_target(operation, opts),
          :ok <- Runtime.validate_target(operation, model, mode),
-         request <- build_one_shot_request(operation, payload, model, opts),
+         {:ok, prepared_payload} <- prepare_one_shot_payload(operation, payload),
+         request <- build_one_shot_request(operation, prepared_payload, model, opts),
          {:ok, response} <-
            runtime.generate(Runtime.endpoint_with_model(endpoint, model), request, opts),
          {:ok, json} <- extract_json_response(response),
@@ -197,6 +183,9 @@ defmodule BDS.AI.OneShot do
     end
   end
 
+  defp prepare_one_shot_payload(:analyze_image, payload), do: resolve_image_data_url(payload)
+  defp prepare_one_shot_payload(_operation, payload), do: {:ok, payload}
+
   defp build_one_shot_request(operation, payload, model, opts) do
     language = Keyword.get(opts, :language)
 
@@ -213,7 +202,9 @@ defmodule BDS.AI.OneShot do
       messages: [
         %{
           "role" => "system",
-          "content" => one_shot_system_prompt(operation, language, source_language)
+          "content" =>
+            one_shot_system_prompt(operation, language, source_language) <>
+              " Output raw JSON only, without markdown code fences."
         },
         %{
           "role" => "user",
@@ -351,11 +342,11 @@ defmodule BDS.AI.OneShot do
   defp extract_json_response(%{json: json}) when is_map(json), do: {:ok, json}
 
   defp extract_json_response(%{content: content}) when is_binary(content) do
-    case Jason.decode(content) do
-      {:ok, json} when is_map(json) ->
+    case JsonContent.decode(content) do
+      json when is_map(json) ->
         {:ok, json}
 
-      _other ->
+      nil ->
         Logger.error(
           "AI extract_json_response failed to parse content as JSON. Content: #{String.slice(content, 0, 1000)}"
         )
@@ -406,7 +397,9 @@ defmodule BDS.AI.OneShot do
        title: media.title || "",
        alt: media.alt || "",
        caption: media.caption || "",
-       image_url: Map.get(media, :image_url),
+       # A stored media row has no remote URL; resolve_image_data_url/1 fills
+       # this from file_path before an :analyze_image request is built.
+       image_url: nil,
        file_path: media.file_path,
        project_id: media.project_id,
        language: media.language || ""

lib/bds/ai/openai_compatible_runtime.ex

@@ -4,14 +4,13 @@ defmodule BDS.AI.OpenAICompatibleRuntime do
   require Logger
 
   alias BDS.AI.HttpClient
+  alias BDS.AI.SSE
 
   def list_models(endpoint, opts \\ []) when is_map(endpoint) and is_list(opts) do
     http_client = Keyword.get(opts, :http_client, HttpClient)
     url = models_url(endpoint.url)
 
-    headers =
-      %{"accept" => "application/json"}
-      |> maybe_put_auth(endpoint.api_key)
+    headers = request_headers(endpoint.api_key, false)
 
     with {:ok, response} <- http_client.get(url, headers),
          200 <- response.status do
@@ -22,25 +21,20 @@ defmodule BDS.AI.OpenAICompatibleRuntime do
     end
   end
 
-  def generate(endpoint, request, _opts) when is_map(endpoint) and is_map(request) do
+  def generate(endpoint, request, opts) when is_map(endpoint) and is_map(request) do
     url = completions_url(endpoint.url)
 
-    headers =
-      %{
-        "content-type" => "application/json",
-        "accept" => "application/json"
-      }
-      |> maybe_put_auth(endpoint.api_key)
+    headers = request_headers(endpoint.api_key, true)
+    payload = base_payload(request)
 
-    payload =
-      %{
-        "model" => request.model,
-        "messages" => request.messages,
-        "max_tokens" => request.max_output_tokens
-      }
-      |> maybe_disable_thinking(request.model)
-      |> maybe_put_tools(Map.get(request, :tools, []))
+    if stream?(request, opts) do
+      generate_streaming(url, headers, payload, request, Keyword.fetch!(opts, :on_stream))
+    else
+      generate_blocking(url, headers, payload, request)
+    end
+  end
 
+  defp generate_blocking(url, headers, payload, request) do
     payload_json = Jason.encode!(payload)
 
     Logger.debug(
@@ -69,18 +63,83 @@ defmodule BDS.AI.OpenAICompatibleRuntime do
         result
 
       {:ok, %{status: status, body: body}} ->
-        Logger.error(
-          "AI OpenAI-compatible HTTP error status=#{status} body=#{String.slice(body, 0, 2000)}"
-        )
-
-        {:error, %{kind: :http_error, status: status, body: body}}
+        log_http_status_error("AI OpenAI-compatible", status, body)
+        http_status_error(status, body)
 
       {:error, reason} ->
-        Logger.error("AI OpenAI-compatible HTTP request failed: #{inspect(reason)}")
-        {:error, %{kind: :http_error, reason: reason}}
+        log_http_request_error("AI OpenAI-compatible", reason)
+        http_request_error(reason)
     end
   end
 
+  # Streaming variant: same request payload plus stream flags; SSE chunks are
+  # folded into a BDS.AI.SSE assembler that emits cumulative content
+  # snapshots to `on_stream` as they arrive. The assembled message goes
+  # through the same normalization as the blocking path.
+  defp generate_streaming(url, headers, payload, request, on_stream) do
+    payload_json = payload |> streaming_payload() |> Jason.encode!()
+
+    Logger.debug(
+      "AI OpenAI-compatible streaming request operation=#{inspect(Map.get(request, :operation))} model=#{inspect(request.model)} url=#{url} payload_size=#{byte_size(payload_json)}"
+    )
+
+    sse = SSE.new(on_stream, emit_interval_ms: stream_emit_interval_ms())
+
+    case HttpClient.post_stream(url, headers, payload_json, sse, fn chunk, acc ->
+           SSE.feed(acc, chunk)
+         end) do
+      {:ok, %{status: 200, headers: response_headers}, sse} ->
+        if event_stream?(response_headers) do
+          assembled = SSE.finish(sse)
+
+          {:ok,
+           %{
+             content: assembled.content,
+             json: decode_json_content(assembled.content),
+             tool_calls: normalize_tool_calls(assembled.tool_calls),
+             usage: normalize_usage(assembled.usage || %{})
+           }}
+        else
+          # The provider ignored the stream flag and sent a plain completion.
+          normalize_response(SSE.raw_body(sse))
+        end
+
+      {:ok, %{status: status, body: body}, _sse} ->
+        log_http_status_error("AI OpenAI-compatible streaming", status, body)
+        http_status_error(status, body)
+
+      {:error, reason} ->
+        log_http_request_error("AI OpenAI-compatible streaming", reason)
+        http_request_error(reason)
+    end
+  end
+
+  # Streaming is opt-in per request (the caller passes :on_stream), limited
+  # to interactive chat, and can be disabled globally for providers that do
+  # not support SSE (config :bds, :chat, streaming: false).
+  defp stream?(request, opts) do
+    Map.get(request, :operation) == :chat and
+      is_function(Keyword.get(opts, :on_stream), 1) and
+      chat_config(:streaming, true)
+  end
+
+  defp stream_emit_interval_ms, do: chat_config(:stream_emit_interval_ms, 100)
+
+  defp event_stream?(headers) do
+    case headers["content-type"] do
+      content_type when is_binary(content_type) ->
+        String.contains?(content_type, "text/event-stream")
+
+      _missing ->
+        # No content type: trust the request we made and parse as SSE.
+        true
+    end
+  end
+
+  defp chat_config(key, default) do
+    :bds |> Application.get_env(:chat, []) |> Keyword.get(key, default)
+  end
+
   defp normalize_response(body) do
     with {:ok, payload} <- decode_json_body(body) do
       message = get_in(payload, ["choices", Access.at(0), "message"]) || %{}
@@ -88,21 +147,17 @@ defmodule BDS.AI.OpenAICompatibleRuntime do
       tool_calls = normalize_tool_calls(message["tool_calls"] || [])
       usage = normalize_usage(payload["usage"] || %{})
 
-      json =
-        case content do
-          nil ->
-            nil
-
-          value when is_binary(value) ->
-            case Jason.decode(value) do
-              {:ok, decoded} when is_map(decoded) -> decoded
-              _other -> nil
+      {:ok,
+       %{
+         content: content,
+         json: decode_json_content(content),
+         tool_calls: tool_calls,
+         usage: usage
+       }}
     end
   end
 
-      {:ok, %{content: content, json: json, tool_calls: tool_calls, usage: usage}}
-    end
-  end
+  defp decode_json_content(content), do: BDS.AI.JsonContent.decode(content)
 
   defp completions_url(url) do
     cond do
@@ -156,6 +211,44 @@ defmodule BDS.AI.OpenAICompatibleRuntime do
     end
   end
 
+  defp request_headers(api_key, include_content_type?) do
+    %{"accept" => "application/json"}
+    |> maybe_put_content_type(include_content_type?)
+    |> maybe_put_auth(api_key)
+  end
+
+  defp maybe_put_content_type(headers, true),
+    do: Map.put(headers, "content-type", "application/json")
+
+  defp maybe_put_content_type(headers, false), do: headers
+
+  defp base_payload(request) do
+    %{
+      "model" => request.model,
+      "messages" => request.messages,
+      "max_tokens" => request.max_output_tokens
+    }
+    |> maybe_disable_thinking(request.model)
+    |> maybe_put_tools(Map.get(request, :tools, []))
+  end
+
+  defp streaming_payload(payload) do
+    payload
+    |> Map.put("stream", true)
+    |> Map.put("stream_options", %{"include_usage" => true})
+  end
+
+  defp log_http_status_error(prefix, status, body) do
+    Logger.error("#{prefix} HTTP error status=#{status} body=#{String.slice(body, 0, 2000)}")
+  end
+
+  defp log_http_request_error(prefix, reason) do
+    Logger.error("#{prefix} request failed: #{inspect(reason)}")
+  end
+
+  defp http_status_error(status, body), do: {:error, %{kind: :http_error, status: status, body: body}}
+  defp http_request_error(reason), do: {:error, %{kind: :http_error, reason: reason}}
+
   defp maybe_put_auth(headers, nil), do: headers
   defp maybe_put_auth(headers, ""), do: headers
 

lib/bds/ai/runtime.ex

@@ -107,5 +107,5 @@ defmodule BDS.AI.Runtime do
     end
   end
 
-  defp blank?(value), do: value in [nil, ""]
+  defp blank?(value), do: BDS.Values.blank?(value)
 end

lib/bds/ai/secret_backend.ex

@@ -1,10 +1,34 @@
 defmodule BDS.AI.SecretBackend do
-  @moduledoc false
+  @moduledoc """
+  Encrypts and decrypts AI provider secrets (AES-256-GCM) with the
+  machine-local master key resolved by `BDS.AI.SecretKey`.
+
+  Values written by earlier releases — encrypted with key material that
+  shipped in the repository, or with the deterministic node-name fallback —
+  are still readable: `decrypt/1` falls back to the legacy keys, and
+  `BDS.AI.SecretMigration` re-encrypts such rows at boot. When no master key
+  can be obtained, both operations return `{:error, :secret_key_unavailable}`
+  instead of degrading to a weaker key.
+  """
+
+  require Logger
+
+  alias BDS.AI.SecretKey
 
   @aad "bds-ai-secret"
 
+  # Key material shipped in the repository before TD-01. Retained only so
+  # existing user databases can be read and re-encrypted by
+  # BDS.AI.SecretMigration; remove both together in a future release.
+  @legacy_repo_key binary_part(
+                     "bds_desktop_shell_secret_key_base_64_chars_minimum_seed_value_001",
+                     0,
+                     32
+                   )
+
+  @spec encrypt(String.t()) :: {:ok, String.t()} | {:error, term()}
   def encrypt(value) when is_binary(value) do
-    key = secret_key()
+    with {:ok, key} <- secret_key() do
       iv = :crypto.strong_rand_bytes(12)
 
       {ciphertext, tag} =
@@ -12,14 +36,60 @@ defmodule BDS.AI.SecretBackend do
 
       {:ok, Base.encode64(iv <> tag <> ciphertext)}
     end
+  end
 
+  @spec decrypt(String.t()) :: {:ok, String.t()} | {:error, term()}
   def decrypt(encoded) when is_binary(encoded) do
+    with {:ok, key} <- secret_key() do
+      decrypt_with_fallback(encoded, key)
+    end
+  end
+
+  @doc """
+  Decrypts strictly with the current master key — no legacy fallback. Used by
+  `BDS.AI.SecretMigration` to detect rows that still need re-encryption.
+  """
+  @spec decrypt_with_current_key(String.t()) :: {:ok, String.t()} | {:error, term()}
+  def decrypt_with_current_key(encoded) when is_binary(encoded) do
+    with {:ok, key} <- secret_key() do
+      decrypt_with(encoded, key)
+    end
+  end
+
+  @doc """
+  Attempts decryption with the legacy keys used by earlier releases.
+  """
+  @spec decrypt_legacy(String.t()) :: {:ok, String.t()} | {:error, :invalid_ciphertext}
+  def decrypt_legacy(encoded) when is_binary(encoded) do
+    Enum.find_value(legacy_keys(), {:error, :invalid_ciphertext}, fn key ->
+      case decrypt_with(encoded, key) do
+        {:ok, plaintext} -> {:ok, plaintext}
+        {:error, :invalid_ciphertext} -> nil
+      end
+    end)
+  end
+
+  defp legacy_keys do
+    [
+      @legacy_repo_key,
+      :crypto.hash(:sha256, Atom.to_string(node()) <> ":bds:ai")
+    ]
+  end
+
+  defp decrypt_with_fallback(encoded, key) do
+    case decrypt_with(encoded, key) do
+      {:ok, _plaintext} = ok -> ok
+      {:error, :invalid_ciphertext} -> decrypt_legacy(encoded)
+    end
+  end
+
+  defp decrypt_with(encoded, key) do
     with {:ok, binary} <- Base.decode64(encoded),
          <<iv::binary-size(12), tag::binary-size(16), ciphertext::binary>> <- binary,
          plaintext when is_binary(plaintext) <-
            :crypto.crypto_one_time_aead(
              :aes_256_gcm,
-             secret_key(),
+             key,
              iv,
              ciphertext,
              @aad,
@@ -33,9 +103,13 @@ defmodule BDS.AI.SecretBackend do
   end
 
   defp secret_key do
-    case Application.get_env(:bds, :ai_secret_key) do
-      key when is_binary(key) and byte_size(key) >= 32 -> binary_part(key, 0, 32)
-      _other -> :crypto.hash(:sha256, Atom.to_string(node()) <> ":bds:ai")
+    case SecretKey.fetch() do
+      {:ok, key} ->
+        {:ok, key}
+
+      {:error, reason} ->
+        Logger.error("AI secret key unavailable: #{inspect(reason)}")
+        {:error, :secret_key_unavailable}
     end
   end
 end

lib/bds/ai/secret_key.ex

@@ -0,0 +1,232 @@
+defmodule BDS.AI.SecretKey do
+  @moduledoc """
+  Resolves the 32-byte machine-local master key that encrypts AI provider
+  secrets at rest (the `SecureKeyStore` entity in `specs/ai.allium`).
+
+  Resolution order:
+
+  1. `config :bds, :ai_secret_key` — explicit override. Used by the test
+     suite for determinism; must be at least 32 bytes (the first 32 are
+     used). An invalid value is an error, never a silent fallback.
+  2. A previously resolved key cached in `:persistent_term`.
+  3. The OS keyring: on macOS the login Keychain via the `security` CLI; on
+     other platforms — or when the Keychain is unavailable — a random key
+     file under the private app dir, written with `0600` permissions.
+
+  A fresh random key is generated and stored on first use. There is no
+  deterministic fallback: when no key can be obtained or persisted, `fetch/0`
+  returns `{:error, reason}` and secret encryption/decryption fails loudly
+  instead of degrading to obfuscation.
+
+  Config (`config :bds, BDS.AI.SecretKey`):
+
+    * `:strategy` — `:auto` (default; Keychain on macOS, key file elsewhere),
+      `:keychain`, or `:file`
+    * `:key_file_path` — overrides the key file location
+    * `:command_runner` — 3-arity replacement for `System.cmd/3` (tests)
+  """
+
+  require Logger
+
+  @key_bytes 32
+  @cache_key {__MODULE__, :key}
+  @keychain_service "bDS2"
+  @keychain_account "ai-secret-key"
+  @keychain_not_found_status 44
+  @key_file_name "ai_secret.key"
+
+  @spec fetch() :: {:ok, binary()} | {:error, term()}
+  def fetch do
+    case configured_key() do
+      {:ok, key} -> {:ok, key}
+      {:error, _detail} = error -> error
+      :unset -> cached_or_resolve()
+    end
+  end
+
+  @doc "Clears the cached key so the next fetch re-resolves it (test helper)."
+  @spec reset_cache() :: :ok
+  def reset_cache do
+    :persistent_term.erase(@cache_key)
+    :ok
+  end
+
+  defp configured_key do
+    case Application.get_env(:bds, :ai_secret_key) do
+      nil ->
+        :unset
+
+      key when is_binary(key) and byte_size(key) >= @key_bytes ->
+        {:ok, binary_part(key, 0, @key_bytes)}
+
+      other ->
+        {:error, {:invalid_configured_key, "expected a binary of at least #{@key_bytes} bytes, got: #{inspect(other)}"}}
+    end
+  end
+
+  defp cached_or_resolve do
+    case :persistent_term.get(@cache_key, nil) do
+      key when is_binary(key) ->
+        {:ok, key}
+
+      nil ->
+        with {:ok, key} <- resolve() do
+          :persistent_term.put(@cache_key, key)
+          {:ok, key}
+        end
+    end
+  end
+
+  defp resolve do
+    case strategy() do
+      :keychain -> resolve_keychain()
+      :file -> resolve_file()
+    end
+  end
+
+  defp strategy do
+    case config(:strategy, :auto) do
+      :auto ->
+        if match?({:unix, :darwin}, :os.type()), do: :keychain, else: :file
+
+      explicit when explicit in [:keychain, :file] ->
+        explicit
+    end
+  end
+
+  # ─── macOS Keychain ─────────────────────────────────────────
+
+  defp resolve_keychain do
+    case keychain_find() do
+      {:ok, key} ->
+        {:ok, key}
+
+      :not_found ->
+        keychain_create()
+
+      {:error, reason} ->
+        fallback_to_key_file("AI secret key: macOS Keychain unavailable", inspect(reason))
+    end
+  end
+
+  defp keychain_find do
+    case run_security([
+           "find-generic-password",
+           "-s",
+           @keychain_service,
+           "-a",
+           @keychain_account,
+           "-w"
+         ]) do
+      {output, 0} ->
+        case output |> String.trim() |> Base.decode64() do
+          {:ok, key} when byte_size(key) == @key_bytes -> {:ok, key}
+          _other -> {:error, :corrupt_keychain_item}
+        end
+
+      {_output, @keychain_not_found_status} ->
+        :not_found
+
+      {output, status} ->
+        {:error, {:security_failed, status, String.trim(output)}}
+    end
+  end
+
+  # The generated key passes through `security`'s argv, which is briefly
+  # visible to other local processes of the same user. Accepted trade-off for
+  # a single-user desktop app; `security` offers no non-interactive way to
+  # take the password on stdin in one shot.
+  defp keychain_create do
+    key = :crypto.strong_rand_bytes(@key_bytes)
+
+    case run_security([
+           "add-generic-password",
+           "-U",
+           "-s",
+           @keychain_service,
+           "-a",
+           @keychain_account,
+           "-w",
+           Base.encode64(key)
+         ]) do
+      {_output, 0} ->
+        {:ok, key}
+
+      {output, status} ->
+        fallback_to_key_file(
+          "AI secret key: could not store the key in the Keychain",
+          "status #{status}: #{String.trim(output)}"
+        )
+    end
+  end
+
+  defp run_security(args) do
+    runner = config(:command_runner, &default_runner/3)
+    runner.("security", args, stderr_to_stdout: true)
+  end
+
+  defp default_runner(command, args, opts) do
+    System.cmd(command, args, opts)
+  rescue
+    error in ErlangError -> {"#{command} unavailable: #{inspect(error.original)}", 127}
+  end
+
+  # ─── Key file ───────────────────────────────────────────────
+
+  defp resolve_file do
+    path = key_file_path()
+
+    case File.read(path) do
+      {:ok, contents} -> decode_key_file(contents, path)
+      {:error, :enoent} -> create_key_file(path)
+      {:error, reason} -> {:error, {:key_file_unreadable, path, reason}}
+    end
+  end
+
+  defp decode_key_file(contents, path) do
+    case contents |> String.trim() |> Base.decode64() do
+      {:ok, key} when byte_size(key) == @key_bytes -> {:ok, key}
+      _other -> {:error, {:key_file_corrupt, path}}
+    end
+  end
+
+  defp create_key_file(path) do
+    key = :crypto.strong_rand_bytes(@key_bytes)
+    temp_path = path <> ".tmp." <> Integer.to_string(System.unique_integer([:positive]))
+
+    with :ok <- File.mkdir_p(Path.dirname(path)),
+         :ok <- File.write(temp_path, Base.encode64(key) <> "\n"),
+         :ok <- File.chmod(temp_path, 0o600),
+         :ok <- File.rename(temp_path, path) do
+      {:ok, key}
+    else
+      {:error, reason} ->
+        _ = File.rm(temp_path)
+        {:error, {:key_file_write_failed, path, reason}}
+    end
+  end
+
+  defp key_file_path do
+    config(:key_file_path, nil) || Path.join(private_app_dir(), @key_file_name)
+  end
+
+  # Same private app dir as BDS.Projects.private_app_dir/0 — on macOS
+  # ~/Library/Application Support/BDS2. Duplicated to keep this module free of
+  # project/DB dependencies.
+  defp private_app_dir do
+    case :filename.basedir(:user_config, "BDS2") do
+      path when is_list(path) -> List.to_string(path)
+      path -> path
+    end
+    |> Path.expand()
+  end
+
+  defp config(key, default) do
+    Application.get_env(:bds, __MODULE__, []) |> Keyword.get(key, default)
+  end
+
+  defp fallback_to_key_file(prefix, detail) do
+    Logger.warning(prefix <> " (" <> detail <> "); falling back to the key file")
+    resolve_file()
+  end
+end

lib/bds/ai/secret_migration.ex

@@ -0,0 +1,67 @@
+defmodule BDS.AI.SecretMigration do
+  @moduledoc """
+  Idempotent boot-time re-encryption of stored AI secrets.
+
+  Earlier releases encrypted secrets with key material shipped in the
+  repository (or a deterministic node-name fallback). This pass finds the
+  `__encrypted_*` rows in `settings`, decrypts them with the legacy keys, and
+  re-encrypts them with the machine-local key from `BDS.AI.SecretKey`. Rows
+  already encrypted with the current key are left untouched; rows no known
+  key can decrypt are left in place and reported, so the user can re-enter
+  the secret. Runs from `BDS.RepoBootstrap` on every boot; on a migrated
+  database it is a cheap no-op.
+  """
+
+  import Ecto.Query
+
+  require Logger
+
+  alias BDS.AI.SecretBackend
+  alias BDS.Persistence
+  alias BDS.Repo
+  alias BDS.Settings.Setting
+
+  @encrypted_prefix "__encrypted_"
+
+  @spec migrate_legacy_secrets(module()) ::
+          {:ok, %{migrated: non_neg_integer(), failed: non_neg_integer()}}
+  def migrate_legacy_secrets(repo \\ Repo) do
+    summary =
+      from(setting in Setting, where: like(setting.key, ^"#{@encrypted_prefix}%"))
+      |> repo.all()
+      |> Enum.reduce(%{migrated: 0, failed: 0}, fn setting, acc ->
+        case migrate_row(repo, setting) do
+          :current -> acc
+          :migrated -> %{acc | migrated: acc.migrated + 1}
+          :failed -> %{acc | failed: acc.failed + 1}
+        end
+      end)
+
+    {:ok, summary}
+  end
+
+  defp migrate_row(repo, setting) do
+    with {:error, _no_current_key_match} <- SecretBackend.decrypt_with_current_key(setting.value),
+         {:ok, plaintext} <- SecretBackend.decrypt_legacy(setting.value),
+         {:ok, reencrypted} <- SecretBackend.encrypt(plaintext) do
+      repo.update_all(
+        from(s in Setting, where: s.key == ^setting.key),
+        set: [value: reencrypted, updated_at: Persistence.now_ms()]
+      )
+
+      Logger.info("AI secret #{setting.key} re-encrypted with the machine-local key")
+      :migrated
+    else
+      {:ok, _already_current} ->
+        :current
+
+      {:error, reason} ->
+        Logger.warning(
+          "AI secret #{setting.key} could not be re-encrypted (#{inspect(reason)}); " <>
+            "leaving it unchanged — the secret may need to be entered again"
+        )
+
+        :failed
+    end
+  end
+end

lib/bds/ai/sse.ex

@@ -0,0 +1,176 @@
+defmodule BDS.AI.SSE do
+  @moduledoc """
+  Incremental assembler for OpenAI-compatible `text/event-stream` chat
+  completions.
+
+  Fed raw transport chunks via `feed/2`, it buffers partial events, decodes
+  `data:` payloads, and accumulates content deltas, tool-call fragments, and
+  usage. Content is reported to the optional `on_event` callback as
+  **cumulative snapshots** (`%{content: binary}`) — replace semantics, which
+  matches how the chat editor renders streaming state and resets naturally
+  between tool rounds. Emissions are throttled to `:emit_interval_ms`
+  (the first delta always emits immediately for perceived latency).
+
+  `finish/1` returns the assembled message in OpenAI wire shape so the
+  runtime can reuse its non-streaming normalization:
+  `%{content: binary | nil, tool_calls: [%{"id" => _, "function" => %{"name" => _, "arguments" => json_string}}], usage: map | nil}`.
+  """
+
+  defstruct buffer: "",
+            raw: [],
+            content: [],
+            content?: false,
+            tool_calls: %{},
+            usage: nil,
+            done?: false,
+            on_event: nil,
+            emit_interval_ms: 100,
+            last_emit_at: nil
+
+  @type t :: %__MODULE__{}
+
+  @spec new((map() -> any()) | nil, keyword()) :: t()
+  def new(on_event \\ nil, opts \\ []) when is_list(opts) do
+    %__MODULE__{
+      on_event: on_event,
+      emit_interval_ms: Keyword.get(opts, :emit_interval_ms, 100)
+    }
+  end
+
+  @spec feed(t(), binary()) :: t()
+  def feed(%__MODULE__{done?: true} = sse, _chunk), do: sse
+
+  def feed(%__MODULE__{} = sse, chunk) when is_binary(chunk) do
+    sse = %{sse | raw: [chunk | sse.raw]}
+    parts = String.split(sse.buffer <> chunk, ~r/\r?\n\r?\n/)
+    {complete_events, [rest]} = Enum.split(parts, -1)
+
+    Enum.reduce(complete_events, %{sse | buffer: rest}, &process_event(&2, &1))
+  end
+
+  @doc """
+  The unparsed transport bytes, for callers that discover after the fact
+  that the response was not an event stream (e.g. a provider that ignored
+  the `stream` flag and answered with plain JSON).
+  """
+  @spec raw_body(t()) :: binary()
+  def raw_body(%__MODULE__{} = sse) do
+    sse.raw |> Enum.reverse() |> IO.iodata_to_binary()
+  end
+
+  @spec finish(t()) :: %{content: binary() | nil, tool_calls: [map()], usage: map() | nil}
+  def finish(%__MODULE__{} = sse) do
+    # A final event may arrive without its trailing blank line.
+    sse =
+      case String.trim(sse.buffer) do
+        "" -> sse
+        remnant -> process_event(%{sse | buffer: ""}, remnant)
+      end
+
+    %{
+      content: assembled_content(sse),
+      tool_calls: assembled_tool_calls(sse),
+      usage: sse.usage
+    }
+  end
+
+  defp process_event(%{done?: true} = sse, _event), do: sse
+
+  defp process_event(sse, event) do
+    data =
+      event
+      |> String.split(~r/\r?\n/)
+      |> Enum.flat_map(&data_line/1)
+      |> Enum.join("\n")
+
+    cond do
+      data == "" ->
+        sse
+
+      String.trim(data) == "[DONE]" ->
+        %{sse | done?: true}
+
+      true ->
+        case Jason.decode(data) do
+          {:ok, payload} when is_map(payload) -> apply_payload(sse, payload)
+          _other -> sse
+        end
+    end
+  end
+
+  defp data_line("data: " <> rest), do: [rest]
+  defp data_line("data:" <> rest), do: [rest]
+  defp data_line(_line), do: []
+
+  defp apply_payload(sse, payload) do
+    delta = get_in(payload, ["choices", Access.at(0), "delta"]) || %{}
+
+    sse
+    |> apply_content(delta["content"])
+    |> apply_tool_calls(delta["tool_calls"])
+    |> apply_usage(payload["usage"])
+  end
+
+  defp apply_content(sse, content) when is_binary(content) and content != "" do
+    %{sse | content: [content | sse.content], content?: true}
+    |> maybe_emit()
+  end
+
+  defp apply_content(sse, _content), do: sse
+
+  defp apply_tool_calls(sse, [_ | _] = fragments) do
+    Enum.reduce(fragments, sse, fn fragment, acc ->
+      index = fragment["index"] || 0
+      existing = Map.get(acc.tool_calls, index, %{id: nil, name: nil, arguments: []})
+      function_part = fragment["function"] || %{}
+
+      merged = %{
+        id: existing.id || fragment["id"],
+        name: existing.name || function_part["name"],
+        arguments: [existing.arguments, function_part["arguments"] || ""]
+      }
+
+      %{acc | tool_calls: Map.put(acc.tool_calls, index, merged)}
+    end)
+  end
+
+  defp apply_tool_calls(sse, _fragments), do: sse
+
+  defp apply_usage(sse, usage) when is_map(usage) and map_size(usage) > 0,
+    do: %{sse | usage: usage}
+
+  defp apply_usage(sse, _usage), do: sse
+
+  defp maybe_emit(%{on_event: nil} = sse), do: sse
+
+  defp maybe_emit(sse) do
+    now = System.monotonic_time(:millisecond)
+
+    if is_nil(sse.last_emit_at) or now - sse.last_emit_at >= sse.emit_interval_ms do
+      sse.on_event.(%{content: assembled_content(sse) || ""})
+      %{sse | last_emit_at: now}
+    else
+      sse
+    end
+  end
+
+  defp assembled_content(%{content?: false}), do: nil
+
+  defp assembled_content(sse) do
+    sse.content |> Enum.reverse() |> IO.iodata_to_binary()
+  end
+
+  defp assembled_tool_calls(sse) do
+    sse.tool_calls
+    |> Enum.sort_by(fn {index, _tool_call} -> index end)
+    |> Enum.map(fn {_index, tool_call} ->
+      %{
+        "id" => tool_call.id,
+        "function" => %{
+          "name" => tool_call.name,
+          "arguments" => IO.iodata_to_binary(tool_call.arguments)
+        }
+      }
+    end)
+  end
+end

lib/bds/application.ex

@@ -5,6 +5,27 @@ defmodule BDS.Application do
 
   @compiled_env Application.compile_env(:bds, :current_env, Mix.env())
 
+  # Children that depend on the boot mode (issue #26): desktop mode runs the
+  # wx window shell, server mode runs headless behind the SSH daemon. Both
+  # start the loopback HTTP endpoint and the CLI sync watcher.
+  def mode_children(:server, _env) do
+    [{BDS.Desktop.Server, []}, BDS.CliSync.Watcher, BDS.Server]
+  end
+
+  # CLI mode (issue #25): a one-shot command run against the shared database.
+  # No HTTP listener, SSH daemon, window, or sync watcher — the CLI is the
+  # external writer the watcher in a concurrently running app listens for.
+  def mode_children(:cli, _env), do: []
+
+  # Local TUI: the headless server plus a TUI on the launching terminal, so
+  # a GUI (via tunnel) and the local terminal can work in parallel. Quitting
+  # this TUI stops the whole VM — the terminal is the app in this mode.
+  # SSH-served TUI sessions never get this flag and stay session-local.
+  def mode_children(:tui, env),
+    do: mode_children(:server, env) ++ [{BDS.TUI, [stop_vm_on_exit: true]}]
+
+  def mode_children(:desktop, env), do: desktop_children(env)
+
   def desktop_children(env \\ nil)
 
   def desktop_children(:test) do
@@ -32,6 +53,7 @@ defmodule BDS.Application do
         BDS.Repo,
         BDS.RepoBootstrap,
         BDS.Tasks,
+        BDS.AI.InFlight,
         BDS.Preview,
         BDS.Publishing,
         {Task.Supervisor, name: BDS.Tasks.TaskSupervisor},
@@ -40,7 +62,7 @@ defmodule BDS.Application do
         {Task.Supervisor, name: BDS.Scripting.TaskSupervisor},
         BDS.Scripting.JobSupervisor,
         BDS.Embeddings.Index
-      ] ++ embedding_children() ++ desktop_children(current_env())
+      ] ++ embedding_children() ++ mode_children(boot_mode(), current_env())
 
     opts = [strategy: :one_for_one, name: BDS.Supervisor]
     Supervisor.start_link(children, opts)
@@ -60,10 +82,26 @@ defmodule BDS.Application do
     Application.get_env(:bds, :current_env_override) || @compiled_env
   end
 
+  # Desktop mode without a graphical display boots the TUI instead
+  # (issue #33); the log line explains the surprise mode switch.
+  defp boot_mode do
+    resolved = BDS.Server.mode()
+    effective = BDS.Server.effective_mode(resolved)
+
+    if effective != resolved do
+      require Logger
+      Logger.info("No graphical display available, starting the terminal UI instead")
+    end
+
+    effective
+  end
+
   defp desktop_window_children do
     if desktop_automation?() do
       []
     else
+      disable_auto_window_menu()
+
       window_opts =
         BDS.Desktop.MainWindow.window_options(
           menubar: BDS.Desktop.MenuBar,
@@ -74,17 +112,32 @@ defmodule BDS.Application do
       [
         {Desktop.Window, window_opts},
         Supervisor.child_spec({BDS.Desktop.MainWindow, []}, id: BDS.Desktop.MainWindow.Watcher),
-        {BDS.Desktop.DeepLink, []}
+        {BDS.Desktop.DeepLink, []},
+        {BDS.Desktop.RemoteConnection, []}
       ]
     end
   end
 
+  # wxOSX injects an untracked "Window" menu into the menubar at install time,
+  # which races elixir-desktop's async menu populate and ends up at an
+  # unstable position. We disable it and ship our own :window menu group
+  # (BDS.UI.MenuBar) placed between Blog and Help.
+  defp disable_auto_window_menu do
+    if :os.type() == {:unix, :darwin} do
+      :wx.set_env(Desktop.Env.wx_env())
+      :wxMenuBar.setAutoWindowMenu(false)
+    end
+  end
+
   defp desktop_automation? do
     System.get_env("BDS_DESKTOP_AUTOMATION") in ["1", "true", "TRUE"]
   end
 
+  # The desktop endpoint binds to loopback only and its sessions do not need
+  # to survive restarts, so without explicit config the signing secret is a
+  # random per-boot value rather than a static one shipped in the repo.
   defp desktop_secret_key_base do
     Application.get_env(:bds, :desktop)[:secret_key_base] ||
-      raise "missing :desktop secret_key_base configuration"
+      Base.encode64(:crypto.strong_rand_bytes(48))
   end
 end

lib/bds/blogmark.ex

@@ -22,6 +22,11 @@ defmodule BDS.Blogmark do
   @scheme "bds2"
   @new_post_action "new-post"
 
+  # Input-hardening limits mirrored from the legacy bDS app (shared/blogmark.ts).
+  @max_title_length 200
+  @max_url_length 2048
+  @control_chars ~r/[\x00-\x1F\x7F]/
+
   @type candidate :: %{required(String.t()) => term()}
 
   @type receive_result :: %{
@@ -34,7 +39,8 @@ defmodule BDS.Blogmark do
   Parses a `bds2://new-post` deep link into a post candidate map.
 
   Returns `{:ok, candidate}` with string-keyed `title`, `url`, `content`,
-  `tags` and `categories`, or an error when the scheme or action is unsupported.
+  `tags`, `categories` and optional `project_id`, or an error when the scheme
+  or action is unsupported.
   """
   @spec parse_deep_link(String.t()) ::
           {:ok, candidate()} | {:error, :unsupported_scheme | :unsupported_action | :invalid_url}
@@ -54,10 +60,27 @@ defmodule BDS.Blogmark do
     end
   end
 
+  @doc """
+  Returns the `project_id` a deep link targets, or `nil` when the link carries
+  none or cannot be parsed. Used by the shell to switch to the link's project
+  before importing.
+  """
+  @spec deep_link_project_id(String.t()) :: String.t() | nil
+  def deep_link_project_id(url) when is_binary(url) do
+    case parse_deep_link(url) do
+      {:ok, %{"project_id" => project_id}} -> project_id
+      _other -> nil
+    end
+  end
+
   @doc """
   Receives a blogmark deep link for `project_id`: parses it, runs the transform
   pipeline, and creates a draft post from the resulting candidate.
 
+  When the deep link URL carries a `project_id` query parameter, it takes
+  precedence over the passed `project_id` so the bookmarklet can target a
+  specific project regardless of which project is currently active.
+
   Returns `{:ok, %{post:, toasts:, errors:}}` where `toasts` are the
   budget-enforced transform messages and `errors` records any failed transforms.
   """
@@ -66,10 +89,12 @@ defmodule BDS.Blogmark do
   def receive_deep_link(project_id, url, opts \\ [])
       when is_binary(project_id) and is_binary(url) and is_list(opts) do
     with {:ok, candidate} <- parse_deep_link(url),
+         target_project <- resolve_target_project(project_id, candidate),
+         candidate <- apply_default_content(candidate),
          {:ok, %{data: data, toasts: toasts, errors: errors}} <-
-           Transforms.run(project_id, candidate, opts),
-         data <- apply_default_category(project_id, data),
-         {:ok, post} <- create_draft(project_id, data) do
+           Transforms.run(target_project, candidate, opts),
+         data <- apply_default_category(target_project, data),
+         {:ok, post} <- create_draft(target_project, data) do
       {:ok, %{post: post, toasts: toasts, errors: errors}}
     end
   end
@@ -77,15 +102,102 @@ defmodule BDS.Blogmark do
   defp candidate_from_query(query) do
     params = URI.decode_query(query || "")
 
+    project_id =
+      case Map.get(params, "project_id") do
+        nil -> nil
+        "" -> nil
+        id -> id
+      end
+
+    url = sanitize_http_url(Map.get(params, "url"))
+
     %{
-      "title" => Map.get(params, "title", "") |> to_string(),
-      "url" => optional(params, "url"),
+      "title" => sanitize_title(Map.get(params, "title"), url_host(url)),
+      "url" => url,
       "content" => optional(params, "content"),
       "tags" => list_param(params, "tags"),
-      "categories" => list_param(params, "categories")
+      "categories" => list_param(params, "categories"),
+      "project_id" => project_id
     }
   end
 
+  # Strip control characters, trim, cap length; fall back to the URL host when
+  # blank — mirrors bDS sanitizeTitle. Title/url are single-line fields, so
+  # control-character stripping is safe here (unlike the multi-line body).
+  defp sanitize_title(raw, fallback_host) do
+    title =
+      raw
+      |> to_string()
+      |> strip_control()
+      |> String.trim()
+      |> String.slice(0, @max_title_length)
+
+    if title == "", do: fallback_host || "", else: title
+  end
+
+  # Accept only http(s) URLs, strip credentials and fragment, enforce a length
+  # cap; anything else collapses to nil so it can never reach the post body.
+  defp sanitize_http_url(raw) when is_binary(raw) do
+    trimmed = raw |> strip_control() |> String.trim()
+
+    case URI.parse(trimmed) do
+      %URI{scheme: scheme, host: host} = uri
+      when scheme in ["http", "https"] and is_binary(host) and host != "" ->
+        normalized = URI.to_string(%URI{uri | userinfo: nil, fragment: nil})
+        if String.length(normalized) <= @max_url_length, do: normalized, else: nil
+
+      _ ->
+        nil
+    end
+  end
+
+  defp sanitize_http_url(_other), do: nil
+
+  defp url_host(url) when is_binary(url), do: URI.parse(url).host
+  defp url_host(_other), do: nil
+
+  defp strip_control(value), do: String.replace(value, @control_chars, "")
+
+  # If the deep link carries a project_id, route to that project; otherwise
+  # use the currently active project passed by the caller. This lets the
+  # bookmarklet target a specific project even when a different one is open.
+  defp resolve_target_project(_caller_project_id, %{"project_id" => pid}) when is_binary(pid) do
+    pid
+  end
+
+  defp resolve_target_project(project_id, _candidate), do: project_id
+
+  # Match the legacy bDS app: when the bookmarklet supplies no body, seed the
+  # post content with a markdown link to the bookmarked page so transforms run
+  # against the same input. Explicit content always wins.
+  defp apply_default_content(candidate) do
+    with nil <- optional_string(Map.get(candidate, "content")),
+         url when is_binary(url) <- optional_string(Map.get(candidate, "url")) do
+      title = Map.get(candidate, "title", "")
+      Map.put(candidate, "content", blogmark_markdown_link(title, url))
+    else
+      _ -> candidate
+    end
+  end
+
+  defp blogmark_markdown_link(title, url) do
+    "[" <> escape_markdown_link_text(title) <> "](" <> url <> ")"
+  end
+
+  # Mirrors bDS escapeMarkdownLinkText: backslash first, then brackets/parens,
+  # then collapse newlines to spaces.
+  defp escape_markdown_link_text(value) do
+    value
+    |> to_string()
+    |> String.trim()
+    |> String.replace("\\", "\\\\")
+    |> String.replace("[", "\\[")
+    |> String.replace("]", "\\]")
+    |> String.replace("(", "\\(")
+    |> String.replace(")", "\\)")
+    |> String.replace(~r/\r?\n/, " ")
+  end
+
   defp optional(params, key) do
     case Map.get(params, key) do
       nil -> nil

lib/bds/bounded_atoms.ex

@@ -54,19 +54,22 @@ defmodule BDS.BoundedAtoms do
     :fill_missing_translations,
     :find_duplicates,
     :generate_sitemap,
+    :force_render_site,
     :validate_site,
     :upload_site,
     :documentation,
     :api_documentation,
     :close_tab
   ]
-  @menu_actions MenuBar.default_groups(dev_mode?: true)
+  @menu_actions MenuBar.default_groups(dev_mode?: true, window_menu?: true)
                 |> Enum.flat_map(fn group ->
                   Enum.flat_map(group.items, fn
                     %{separator: true} -> []
                     %{id: id} -> [id]
                   end)
                 end)
+  @sidebar_view_ids Enum.map(Registry.sidebar_views(), & &1.id)
+  @editor_route_ids Enum.map(Registry.editor_routes(), & &1.id)
 
   def atom(value, allowed, fallback \\ nil)
 
@@ -101,13 +104,9 @@ defmodule BDS.BoundedAtoms do
     Enum.find(allowed, fallback, &(Atom.to_string(&1) == value))
   end
 
-  defp sidebar_views do
-    Enum.map(Registry.sidebar_views(), & &1.id)
-  end
+  defp sidebar_views, do: @sidebar_view_ids
 
-  defp editor_routes do
-    Enum.map(Registry.editor_routes(), & &1.id)
-  end
+  defp editor_routes, do: @editor_route_ids
 
   defp normalize_menu_kind("category-archive"), do: "category_archive"
   defp normalize_menu_kind(value), do: value

lib/bds/cli.ex

@@ -0,0 +1,335 @@
+defmodule BDS.CLI do
+  @moduledoc """
+  Command-line interface for managing content in a bDS2 workspace (issue #25).
+
+  Runs inside the release VM (`BDS_MODE=cli`) against the same settings and
+  cache database as the GUI/TUI application; mutations write
+  `BDS.CliSync.Notification` rows so a concurrently running app picks them
+  up through `BDS.CliSync.Watcher`.
+
+  The launcher script (`cli/bin/bds-cli` in the release, installable to
+  `~/.local/bin` via `BDS.CLI.Install`) passes the argv via `BDS_CLI_ARGV`
+  (unit-separator joined) because `bin/bds eval` cannot forward arguments.
+  """
+
+  alias BDS.CLI.Commands
+
+  @argv_env "BDS_CLI_ARGV"
+  @argv_separator <<0x1F>>
+
+  @doc "Release entry point: run the command from `BDS_CLI_ARGV` and halt."
+  @spec main() :: no_return()
+  def main do
+    System.halt(run(env_argv()))
+  end
+
+  @doc "Decodes the unit-separator-joined argv from the launcher script."
+  @spec env_argv(String.t() | nil) :: [String.t()]
+  def env_argv(value \\ System.get_env(@argv_env))
+  def env_argv(nil), do: []
+  def env_argv(value), do: String.split(value, @argv_separator, trim: true)
+
+  @doc "Parses and executes an argv, returning the process exit code."
+  @spec run([String.t()]) :: non_neg_integer()
+  def run(argv) when is_list(argv) do
+    optimus = optimus()
+
+    case Optimus.parse(optimus, argv) do
+      {:ok, %Optimus.ParseResult{}} ->
+        print_help(optimus, [])
+        0
+
+      {:ok, subcommand_path, parse_result} ->
+        execute(subcommand_path, parse_result)
+
+      :help ->
+        print_help(optimus, [])
+        0
+
+      {:help, subcommand_path} ->
+        print_help(optimus, subcommand_path)
+        0
+
+      :version ->
+        IO.puts(version())
+        0
+
+      {:error, errors} ->
+        print_errors(optimus, [], errors)
+        1
+
+      {:error, subcommand_path, errors} ->
+        print_errors(optimus, subcommand_path, errors)
+        1
+    end
+  end
+
+  @doc "Executes a parsed subcommand, returning the process exit code."
+  @spec execute([atom()], Optimus.ParseResult.t()) :: non_neg_integer()
+  def execute(subcommand_path, parse_result) do
+    {:ok, _apps} = Application.ensure_all_started(:bds)
+
+    subcommand_path
+    |> Commands.dispatch(parse_result)
+    |> report()
+  end
+
+  defp report(:ok), do: 0
+
+  defp report({:ok, message}) when is_binary(message) do
+    IO.puts(message)
+    0
+  end
+
+  defp report({:error, message}) do
+    IO.puts(:stderr, "Error: " <> format_error(message))
+    1
+  end
+
+  defp format_error(message) when is_binary(message), do: message
+  defp format_error(%{message: message}) when is_binary(message), do: message
+  defp format_error(other), do: inspect(other)
+
+  @repair_parts ~w(post-links media-links thumbnails embeddings search)
+
+  @doc "The Optimus command definition (public for tests and help rendering)."
+  def optimus do
+    Optimus.new!(
+      name: "bds-cli",
+      description: "bDS2 workspace CLI",
+      about:
+        "Manages content in a bDS2 workspace using the same settings and " <>
+          "cache database as the desktop application.",
+      version: version(),
+      allow_unknown_args: false,
+      parse_double_dash: true,
+      subcommands: [
+        rebuild: [
+          name: "rebuild",
+          about: "Rebuild the caching database from the workspace files",
+          flags: [
+            incremental: [
+              long: "--incremental",
+              help:
+                "Run a metadata diff and auto-apply every difference from " <>
+                  "file to database instead of a full rebuild"
+            ]
+          ]
+        ],
+        repair: [
+          name: "repair",
+          about: "Run one of the standard repair tasks outside the full rebuild",
+          args: [
+            part: [
+              value_name: "PART",
+              help: "One of: " <> Enum.join(@repair_parts, ", "),
+              required: true,
+              parser: &parse_repair_part/1
+            ]
+          ]
+        ],
+        render: [
+          name: "render",
+          about: "Render the blog from the current content",
+          flags: [
+            incremental: [
+              long: "--incremental",
+              help: "Validate the generated output and apply only the differences"
+            ],
+            force: [
+              long: "--force",
+              help: "Full re-render ignoring (but updating) stored content hashes"
+            ]
+          ]
+        ],
+        upload: [
+          name: "upload",
+          about: "Upload the rendered site to the configured host (rsync/scp)"
+        ],
+        push: [
+          name: "push",
+          about: "Push the project repository to its origin"
+        ],
+        pull: [
+          name: "pull",
+          about: "Pull the project repository and update the cache database"
+        ],
+        post: [
+          name: "post",
+          about:
+            "Create a post from parameters or from JSON on stdin " <>
+              "(keys: title, content, excerpt, author, language, tags, categories, template)",
+          flags: [
+            stdin: [long: "--stdin", help: "Read post data as JSON from stdin"],
+            no_translate: [
+              long: "--no-translate",
+              help: "Skip automatic translation of the created post"
+            ]
+          ],
+          options: post_content_options()
+        ],
+        media: [
+          name: "media",
+          about:
+            "Import an image with automatically generated title, alt text, " <>
+              "caption and translations",
+          args: [
+            file: [
+              value_name: "FILE",
+              help: "Path of the image file to import",
+              required: true
+            ]
+          ],
+          options: [
+            language: [
+              long: "--language",
+              value_name: "LANG",
+              help: "Language for the generated texts (defaults to the project main language)"
+            ]
+          ]
+        ],
+        gallery: [
+          name: "gallery",
+          about:
+            "Create a gallery post and import all referenced images as new " <>
+              "media with generated texts and translations",
+          allow_unknown_args: true,
+          flags: [
+            stdin: [
+              long: "--stdin",
+              help: "Read gallery data as JSON from stdin (adds an \"images\" key to post keys)"
+            ]
+          ],
+          options: post_content_options()
+        ],
+        config: [
+          name: "config",
+          about: "Read and write global preference values",
+          subcommands: [
+            get: [
+              name: "get",
+              about: "Print a preference value",
+              args: [key: [value_name: "KEY", help: "Preference key", required: true]]
+            ],
+            set: [
+              name: "set",
+              about: "Set a preference value",
+              args: [
+                key: [value_name: "KEY", help: "Preference key", required: true],
+                value: [value_name: "VALUE", help: "New value", required: true]
+              ]
+            ],
+            list: [
+              name: "list",
+              about: "List all preference keys and values"
+            ]
+          ]
+        ],
+        project: [
+          name: "project",
+          about: "Manage the projects registered in the cache database",
+          subcommands: [
+            list: [
+              name: "list",
+              about: "List all projects"
+            ],
+            add: [
+              name: "add",
+              about: "Open a project folder and add it to the cache database",
+              args: [
+                path: [value_name: "PATH", help: "Project data folder", required: true]
+              ],
+              options: [
+                name: [
+                  long: "--name",
+                  value_name: "NAME",
+                  help: "Project name (defaults to the folder name)"
+                ]
+              ]
+            ],
+            switch: [
+              name: "switch",
+              about: "Switch the active project",
+              args: [
+                project: [
+                  value_name: "PROJECT",
+                  help: "Project id, slug, or name",
+                  required: true
+                ]
+              ]
+            ]
+          ]
+        ],
+        tui: [
+          name: "tui",
+          about: "Open the app in TUI mode for interactive use"
+        ],
+        lua: [
+          name: "lua",
+          about: "Run a utility (long-running task) Lua script from the database",
+          allow_unknown_args: true,
+          args: [
+            script: [
+              value_name: "SCRIPT",
+              help: "Script slug in the active project",
+              required: true
+            ]
+          ]
+        ]
+      ]
+    )
+  end
+
+  defp post_content_options do
+    [
+      title: [long: "--title", value_name: "TITLE", help: "Post title"],
+      content: [long: "--content", value_name: "MARKDOWN", help: "Post body (markdown)"],
+      excerpt: [long: "--excerpt", value_name: "TEXT", help: "Post excerpt"],
+      author: [long: "--author", value_name: "NAME", help: "Post author"],
+      language: [
+        long: "--language",
+        value_name: "LANG",
+        help: "Post language (auto-detected from the content when omitted)"
+      ],
+      template: [long: "--template", value_name: "SLUG", help: "Template slug"],
+      tags: [long: "--tags", value_name: "TAGS", help: "Comma-separated tags"],
+      categories: [
+        long: "--categories",
+        value_name: "CATEGORIES",
+        help: "Comma-separated categories"
+      ]
+    ]
+  end
+
+  defp parse_repair_part(value) when value in @repair_parts, do: {:ok, value}
+
+  defp parse_repair_part(value),
+    do: {:error, "unknown repair part #{inspect(value)}; expected one of: #{Enum.join(@repair_parts, ", ")}"}
+
+  defp print_help(optimus, subcommand_path) do
+    optimus
+    |> Optimus.Help.help(subcommand_path, terminal_width())
+    |> Enum.each(&IO.puts/1)
+  end
+
+  defp print_errors(optimus, [], errors) do
+    optimus |> Optimus.Errors.format(errors) |> Enum.each(&IO.puts(:stderr, &1))
+  end
+
+  defp print_errors(optimus, subcommand_path, errors) do
+    optimus
+    |> Optimus.Errors.format(subcommand_path, errors)
+    |> Enum.each(&IO.puts(:stderr, &1))
+  end
+
+  defp terminal_width do
+    case Optimus.Term.width() do
+      {:ok, width} -> width
+      _other -> 80
+    end
+  end
+
+  defp version do
+    to_string(Application.spec(:bds, :vsn) || "dev")
+  end
+end

lib/bds/cli/commands.ex

@@ -0,0 +1,696 @@
+defmodule BDS.CLI.Commands do
+  @moduledoc """
+  Implementations of the `bds-cli` subcommands (issue #25).
+
+  Every command runs synchronously against the engine modules the GUI uses
+  and returns `:ok`, `{:ok, message}`, or `{:error, message}`. Mutations
+  write `BDS.CliSync` notification rows so a concurrently running app
+  refreshes its state (see `specs/cli_sync.allium`).
+  """
+
+  import Ecto.Query
+
+  alias BDS.AI
+  alias BDS.CliSync
+  alias BDS.Desktop.ShellLive.GalleryImport
+  alias BDS.Generation
+  alias BDS.Git
+  alias BDS.Maintenance
+  alias BDS.Media
+  alias BDS.Metadata
+  alias BDS.Posts
+  alias BDS.Posts.AutoTranslation
+  alias BDS.Projects
+  alias BDS.Publishing
+  alias BDS.Repo
+  alias BDS.Scripting
+  alias BDS.Scripts
+  alias BDS.Scripts.Script
+  alias BDS.Search
+  alias BDS.Settings
+  alias BDS.Tasks
+
+  @site_sections [:core, :single, :category, :tag, :date]
+  @bulk_entity_types ~w(post media script template)
+  @gallery_concurrency 2
+  @poll_interval_ms 250
+
+  @doc "Dispatches a parsed subcommand path to its implementation."
+  @spec dispatch([atom()], Optimus.ParseResult.t()) :: :ok | {:ok, String.t()} | {:error, term()}
+  def dispatch([:rebuild], %{flags: %{incremental: true}}),
+    do: with_project(&incremental_rebuild/1)
+
+  def dispatch([:rebuild], _parse_result), do: with_project(&full_rebuild/1)
+
+  def dispatch([:repair], %{args: %{part: part}}),
+    do: with_project(&repair(part, &1))
+
+  def dispatch([:render], %{flags: %{incremental: true, force: true}}),
+    do: {:error, "--incremental and --force are mutually exclusive"}
+
+  def dispatch([:render], %{flags: %{incremental: true}}),
+    do: with_project(&incremental_render/1)
+
+  def dispatch([:render], %{flags: flags}),
+    do: with_project(&full_render(&1, flags[:force] == true))
+
+  def dispatch([:upload], _parse_result), do: with_project(&upload/1)
+
+  def dispatch([:push], _parse_result) do
+    with_project(fn project ->
+      with {:ok, result} <- Git.push(project.id) do
+        print_git_output(result)
+        {:ok, "Pushed"}
+      end
+    end)
+  end
+
+  def dispatch([:pull], _parse_result) do
+    with_project(fn project ->
+      with {:ok, result} <- Git.pull(project.id) do
+        print_git_output(result)
+        # Update the cache database from the pulled files, like the app's
+        # incremental rebuild: file→db for every difference plus orphans.
+        incremental_rebuild(project)
+      end
+    end)
+  end
+
+  def dispatch([:post], %{flags: flags, options: options}) do
+    with_project(fn project ->
+      with {:ok, attrs} <- post_attrs(flags, options),
+           {:ok, attrs} <- ensure_language(attrs),
+           {:ok, post} <- create_post(project, attrs) do
+        unless flags[:no_translate], do: translate_post(post)
+        {:ok, "Created post #{post.id} (#{post.slug}, #{post.language})"}
+      end
+    end)
+  end
+
+  def dispatch([:media], %{args: %{file: file}, options: options}) do
+    with_project(fn project ->
+      with {:ok, metadata} <- Metadata.get_project_metadata(project.id),
+           :ok <- ensure_files_exist([file]) do
+        language = present(options[:language]) || metadata.main_language
+        targets = GalleryImport.translate_targets(metadata, language)
+
+        case GalleryImport.import_and_enrich(file, project.id, language, targets) do
+          {:ok, media, title} ->
+            :ok = notify("media", media.id, :created)
+            {:ok, "Imported media #{media.id} (#{title})"}
+
+          {:error, reason} ->
+            {:error, format_reason(reason)}
+        end
+      end
+    end)
+  end
+
+  def dispatch([:gallery], %{flags: flags, options: options, unknown: unknown}) do
+    with_project(fn project ->
+      with {:ok, attrs, images} <- gallery_attrs(flags, options, unknown),
+           :ok <- ensure_files_exist(images),
+           {:ok, attrs} <- ensure_language(attrs),
+           {:ok, post} <- create_post(project, attrs) do
+        import_gallery_images(project, post, images)
+        :ok = notify("media", "*", :created)
+        :ok = notify("post", post.id, :updated)
+        unless flags[:no_translate], do: translate_post(post)
+        {:ok, "Created gallery post #{post.id} (#{post.slug}) with #{length(images)} images"}
+      end
+    end)
+  end
+
+  def dispatch([:config, :get], %{args: %{key: key}}) do
+    case Settings.get_global_setting(key) do
+      nil -> {:error, "#{key} is not set"}
+      value -> {:ok, value}
+    end
+  end
+
+  def dispatch([:config, :set], %{args: %{key: key, value: value}}) do
+    with :ok <- Settings.put_global_setting(key, value) do
+      :ok = notify("setting", key, :updated)
+      {:ok, "#{key} = #{value}"}
+    end
+  end
+
+  def dispatch([:config, :list], _parse_result) do
+    Settings.list_global_settings()
+    |> Enum.each(fn {key, value} -> IO.puts("#{key}=#{value}") end)
+
+    :ok
+  end
+
+  def dispatch([:project, :list], _parse_result) do
+    Enum.each(Projects.list_projects(), fn project ->
+      marker = if project.is_active, do: "* ", else: "  "
+      IO.puts("#{marker}#{project.id}  #{project.slug}  #{project.name}")
+    end)
+
+    :ok
+  end
+
+  def dispatch([:project, :add], %{args: %{path: path}, options: options}) do
+    expanded = Path.expand(path)
+
+    if File.dir?(expanded) do
+      name = present(options[:name]) || Path.basename(expanded)
+
+      with {:ok, project} <- Projects.create_project(%{name: name, data_path: expanded}) do
+        :ok = notify("project", project.id, :created)
+        {:ok, "Added project #{project.id} (#{project.slug}); switch with: project switch #{project.slug}"}
+      end
+    else
+      {:error, "#{expanded} is not a directory"}
+    end
+  end
+
+  def dispatch([:project, :switch], %{args: %{project: reference}}) do
+    with {:ok, project} <- resolve_project(reference),
+         {:ok, project} <- Projects.set_active_project(project.id) do
+      :ok = notify("project", project.id, :updated)
+      {:ok, "Active project: #{project.name}"}
+    else
+      {:error, :not_found} -> {:error, "No project matches #{inspect(reference)}"}
+      {:error, reason} -> {:error, format_reason(reason)}
+    end
+  end
+
+  def dispatch([:tui], _parse_result) do
+    {:error,
+     "The TUI is started by the bds-cli launcher script (BDS_MODE=tui); " <>
+       "it is not available through a direct BDS.CLI invocation"}
+  end
+
+  def dispatch([:lua], %{args: %{script: slug}, unknown: script_args}) do
+    with_project(fn project ->
+      case Repo.one(
+             from script in Script,
+               where: script.project_id == ^project.id and script.slug == ^slug
+           ) do
+        nil ->
+          {:error, "No script with slug #{inspect(slug)} in the active project"}
+
+        %Script{kind: kind} when kind != :utility ->
+          {:error, "Script #{inspect(slug)} is a #{kind} script; only utility (task) scripts can be run"}
+
+        %Script{enabled: false} ->
+          {:error, "Script #{inspect(slug)} is disabled"}
+
+        script ->
+          run_lua_job(project, script, script_args)
+      end
+    end)
+  end
+
+  # ── rebuild ───────────────────────────────────────────────────────────────
+
+  defp full_rebuild(project) do
+    project.id
+    |> Maintenance.full_rebuild_steps()
+    |> Enum.reduce_while(:ok, fn step, :ok ->
+      IO.puts("==> #{step.name}")
+
+      case step.work.(progress_printer()) do
+        {:error, message} -> {:halt, {:error, message}}
+        _result -> {:cont, :ok}
+      end
+    end)
+    |> case do
+      :ok ->
+        notify_bulk_change()
+        {:ok, "Rebuild complete"}
+
+      error ->
+        error
+    end
+  end
+
+  defp incremental_rebuild(project) do
+    reporter = progress_printer()
+    {:ok, diff} = Maintenance.metadata_diff(project.id, on_progress: reporter)
+
+    items =
+      Enum.map(diff.diff_reports, &%{entity_type: &1.entity_type, entity_id: &1.entity_id})
+
+    orphans = Enum.map(diff.orphan_reports, &%{file_path: &1.file_path})
+
+    if items != [] do
+      {:ok, _repair} =
+        Maintenance.repair_metadata_diff(project.id, :file_to_db, items, on_progress: reporter)
+    end
+
+    if orphans != [] do
+      {:ok, _import} =
+        Maintenance.import_metadata_diff_orphans(project.id, orphans, on_progress: reporter)
+    end
+
+    if items != [] or orphans != [], do: notify_bulk_change()
+
+    {:ok,
+     "Applied #{length(items)} differences and imported #{length(orphans)} orphan files from the filesystem"}
+  end
+
+  # ── repair ────────────────────────────────────────────────────────────────
+
+  defp repair("post-links", project) do
+    :ok = Posts.rebuild_post_links(project.id, on_progress: progress_printer())
+    :ok = notify("post", "*", :updated)
+    {:ok, "Post links rebuilt"}
+  end
+
+  defp repair("media-links", project) do
+    {:ok, result} = Media.rebuild_media_links(project.id, on_progress: progress_printer())
+    :ok = notify("media", "*", :updated)
+    {:ok, "Media links rebuilt (#{result.links} links)"}
+  end
+
+  defp repair("thumbnails", project) do
+    result = Media.regenerate_missing_thumbnails(project.id, on_progress: progress_printer())
+    :ok = notify("media", "*", :updated)
+    {:ok, "Missing thumbnails regenerated (#{inspect(Map.get(result, :generated, 0))} generated)"}
+  end
+
+  defp repair("embeddings", project) do
+    case Maintenance.rebuild_embedding_index(project.id, on_progress: progress_printer()) do
+      {:error, message} -> {:error, message}
+      result -> {:ok, "Embedding index rebuilt (#{result.rebuilt_count} posts)"}
+    end
+  end
+
+  defp repair("search", project) do
+    :ok = Search.reindex_posts(project.id, on_progress: progress_printer())
+    :ok = Search.reindex_media(project.id, on_progress: progress_printer())
+    {:ok, "Search text reindexed"}
+  end
+
+  # ── render ────────────────────────────────────────────────────────────────
+
+  defp full_render(project, force?) do
+    render_opts = if force?, do: [force: true], else: []
+
+    Enum.each(@site_sections, fn section ->
+      IO.puts("==> Rendering #{section}")
+
+      {:ok, _result} =
+        Generation.render_site_section(
+          project.id,
+          section,
+          [on_progress: progress_printer()] ++ render_opts
+        )
+    end)
+
+    IO.puts("==> Building search index")
+
+    {:ok, _index} =
+      Generation.build_site_search_index(
+        project.id,
+        [on_progress: progress_printer()] ++ render_opts
+      )
+
+    {:ok, "Site rendered"}
+  end
+
+  defp incremental_render(project) do
+    {:ok, report} =
+      Generation.validate_site(project.id, @site_sections, on_progress: progress_printer())
+
+    {:ok, applied} =
+      Generation.apply_validation(project.id, report, on_progress: progress_printer())
+
+    {:ok,
+     "Validation applied (#{applied.rendered_url_count} rendered, " <>
+       "#{applied.deleted_url_count} deleted)"}
+  end
+
+  # ── upload ────────────────────────────────────────────────────────────────
+
+  defp upload(project) do
+    with {:ok, metadata} <- Metadata.get_project_metadata(project.id),
+         {:ok, credentials} <- upload_credentials(metadata.publishing_preferences),
+         {:ok, job} <- Publishing.upload_site(project.id, credentials) do
+      await_task(job.task_id, "Upload complete")
+    end
+  end
+
+  defp upload_credentials(prefs) when is_map(prefs) do
+    credentials = %{
+      ssh_host: Map.get(prefs, "ssh_host"),
+      ssh_user: Map.get(prefs, "ssh_user"),
+      ssh_remote_path: Map.get(prefs, "ssh_remote_path"),
+      ssh_mode: Map.get(prefs, "ssh_mode")
+    }
+
+    if Enum.all?(
+         [credentials.ssh_host, credentials.ssh_user, credentials.ssh_remote_path],
+         &is_binary/1
+       ) do
+      {:ok, credentials}
+    else
+      {:error, "Publishing preferences are incomplete; configure the upload host in Settings"}
+    end
+  end
+
+  defp upload_credentials(_prefs),
+    do: {:error, "Publishing preferences are incomplete; configure the upload host in Settings"}
+
+  # ── post / gallery ────────────────────────────────────────────────────────
+
+  defp post_attrs(%{stdin: true}, _options) do
+    with {:ok, data} <- read_stdin_json() do
+      json_post_attrs(data)
+    end
+  end
+
+  defp post_attrs(_flags, options) do
+    case present(options[:title]) do
+      nil ->
+        {:error, "--title is required (or pass --stdin with JSON post data)"}
+
+      title ->
+        {:ok,
+         %{
+           title: title,
+           content: options[:content] || "",
+           excerpt: present(options[:excerpt]),
+           author: present(options[:author]),
+           language: present(options[:language]),
+           template_slug: present(options[:template]),
+           tags: split_list(options[:tags]),
+           categories: split_list(options[:categories])
+         }}
+    end
+  end
+
+  defp gallery_attrs(%{stdin: true}, _options, _unknown) do
+    with {:ok, data} <- read_stdin_json(),
+         {:ok, attrs} <- json_post_attrs(data) do
+      case Map.get(data, "images") do
+        images when is_list(images) and images != [] -> {:ok, attrs, images}
+        _other -> {:error, "JSON gallery data needs a non-empty \"images\" array"}
+      end
+    end
+  end
+
+  defp gallery_attrs(flags, options, unknown) do
+    case unknown do
+      [] ->
+        {:error, "Pass the image files as arguments (or use --stdin with JSON gallery data)"}
+
+      images ->
+        with {:ok, attrs} <- post_attrs(flags, options) do
+          {:ok, attrs, images}
+        end
+    end
+  end
+
+  defp json_post_attrs(data) when is_map(data) do
+    case present(Map.get(data, "title")) do
+      nil ->
+        {:error, "JSON post data needs a \"title\""}
+
+      title ->
+        {:ok,
+         %{
+           title: title,
+           content: Map.get(data, "content") || "",
+           excerpt: present(Map.get(data, "excerpt")),
+           author: present(Map.get(data, "author")),
+           language: present(Map.get(data, "language")),
+           template_slug: present(Map.get(data, "template")),
+           tags: json_list(Map.get(data, "tags")),
+           categories: json_list(Map.get(data, "categories"))
+         }}
+    end
+  end
+
+  defp json_post_attrs(_data), do: {:error, "JSON post data must be an object"}
+
+  defp read_stdin_json do
+    case IO.read(:stdio, :eof) do
+      :eof ->
+        {:error, "No JSON data on stdin"}
+
+      {:error, reason} ->
+        {:error, "Could not read stdin: #{inspect(reason)}"}
+
+      data ->
+        case Jason.decode(data) do
+          {:ok, decoded} -> {:ok, decoded}
+          {:error, error} -> {:error, "Invalid JSON on stdin: #{Exception.message(error)}"}
+        end
+    end
+  end
+
+  # Language auto-detection (issue #25): ask the configured AI endpoint —
+  # BDS.AI internally routes to the local model in airplane mode — and fall
+  # back to the offline search heuristic, informing the user (the CLI
+  # equivalent of the airplane-mode toast).
+  defp ensure_language(%{language: language} = attrs) when is_binary(language), do: {:ok, attrs}
+
+  defp ensure_language(attrs) do
+    text = String.trim("#{attrs.title}\n#{attrs.content}")
+
+    language =
+      case AI.detect_language(text) do
+        {:ok, %{language_code: language}} when is_binary(language) ->
+          language
+
+        _other ->
+          IO.puts("AI language detection unavailable; using the offline heuristic")
+          Search.detect_language(text)
+      end
+
+    {:ok, %{attrs | language: language}}
+  end
+
+  defp create_post(project, attrs) do
+    case Posts.create_post(Map.put(attrs, :project_id, project.id)) do
+      {:ok, post} ->
+        :ok = notify("post", post.id, :created)
+        {:ok, post}
+
+      {:error, %Ecto.Changeset{} = changeset} ->
+        {:error, changeset_message(changeset)}
+    end
+  end
+
+  # Automatic translation mirrors the GUI: schedule the background tasks and
+  # wait for them, so the CLI exits only when the work is done. When nothing
+  # gets scheduled (airplane mode without a local model, or a single-language
+  # blog) the user is told instead of a silent no-op.
+  defp translate_post(post) do
+    before_count = length(active_tasks())
+    :ok = AutoTranslation.maybe_schedule(post)
+
+    case length(active_tasks()) - before_count do
+      queued when queued > 0 ->
+        IO.puts("Waiting for #{queued} translation task(s)...")
+        await_active_tasks()
+        :ok = notify("post", post.id, :updated)
+
+      _none ->
+        IO.puts("Automatic translation was not scheduled (offline, unconfigured AI, or nothing to translate)")
+    end
+
+    :ok
+  end
+
+  defp import_gallery_images(project, post, images) do
+    {:ok, metadata} = Metadata.get_project_metadata(project.id)
+    language = post.language || metadata.main_language
+    parent = self()
+
+    runner =
+      Task.async(fn ->
+        GalleryImport.start(
+          images,
+          project.id,
+          post.id,
+          language,
+          @gallery_concurrency,
+          parent
+        )
+      end)
+
+    print_gallery_progress()
+    Task.await(runner, :infinity)
+  end
+
+  defp print_gallery_progress do
+    receive do
+      {:add_image_processed, title} ->
+        IO.puts("Imported #{title}")
+        print_gallery_progress()
+
+      {:add_image_error, path, reason} ->
+        IO.puts(:stderr, "Failed to import #{path}: #{format_reason(reason)}")
+        print_gallery_progress()
+
+      {:add_images_complete, count} ->
+        IO.puts("Processed #{count} image(s)")
+        :ok
+    end
+  end
+
+  defp ensure_files_exist(paths) do
+    case Enum.reject(paths, &File.regular?/1) do
+      [] -> :ok
+      missing -> {:error, "No such file: #{Enum.join(missing, ", ")}"}
+    end
+  end
+
+  # ── lua ───────────────────────────────────────────────────────────────────
+
+  # Utility ("task") scripts run with the managed-job execution budget
+  # (unlimited time/reductions) but synchronously — the CLI is the one
+  # waiting for the long-running activity.
+  defp run_lua_job(project, script, args) do
+    scripting_config = Application.fetch_env!(:bds, :scripting)
+
+    case Scripting.execute_project_script(
+           project.id,
+           Scripts.resolved_content(script),
+           script.entrypoint || "main",
+           args,
+           timeout: Keyword.get(scripting_config, :job_timeout, :infinity),
+           max_reductions: Keyword.get(scripting_config, :job_max_reductions, :none),
+           on_output: fn text -> IO.puts(text) end
+         ) do
+      {:ok, nil} -> {:ok, "Script finished"}
+      {:ok, result} -> {:ok, "Script finished: #{format_reason(result)}"}
+      {:error, reason} -> {:error, "Script failed: #{format_reason(reason)}"}
+    end
+  end
+
+  # ── shared helpers ────────────────────────────────────────────────────────
+
+  defp with_project(fun) do
+    case Projects.get_active_project() do
+      nil -> {:error, "No active project selected; use: project switch <project>"}
+      project -> fun.(project)
+    end
+  end
+
+  defp resolve_project(reference) do
+    projects = Projects.list_projects()
+
+    found =
+      Enum.find(projects, fn project ->
+        reference in [project.id, project.slug, project.name]
+      end)
+
+    if found, do: {:ok, found}, else: {:error, :not_found}
+  end
+
+  defp await_task(task_id, success_message) do
+    case Tasks.get_task(task_id) do
+      nil ->
+        {:error, "Task disappeared before completion"}
+
+      %{status: :completed} ->
+        {:ok, success_message}
+
+      %{status: :failed} = task ->
+        {:error, format_reason(task.error || "task failed")}
+
+      %{message: message} = task ->
+        print_progress(task.progress || 0.0, message)
+        Process.sleep(@poll_interval_ms)
+        await_task(task_id, success_message)
+    end
+  end
+
+  defp active_tasks do
+    Enum.filter(Tasks.list_tasks(), &(&1.status in [:pending, :running]))
+  end
+
+  defp await_active_tasks do
+    case active_tasks() do
+      [] ->
+        :ok
+
+      _tasks ->
+        Process.sleep(@poll_interval_ms)
+        await_active_tasks()
+    end
+  end
+
+  @doc """
+  A 2-arity progress callback that prints deduplicated `[ 42%] message`
+  lines to stdout.
+  """
+  def progress_printer do
+    &print_progress/2
+  end
+
+  defp print_progress(value, message) do
+    percent = value |> Kernel.*(100) |> round() |> min(100) |> max(0)
+    line = {percent, message}
+
+    if Process.get({__MODULE__, :last_progress}) != line do
+      Process.put({__MODULE__, :last_progress}, line)
+
+      if is_binary(message) and message != "" do
+        IO.puts("[#{String.pad_leading(Integer.to_string(percent), 3)}%] #{message}")
+      end
+    end
+
+    :ok
+  end
+
+  defp print_git_output(%{output: output}) when is_binary(output) and output != "" do
+    IO.puts(String.trim_trailing(output))
+  end
+
+  defp print_git_output(_result), do: :ok
+
+  defp notify(entity_type, entity_id, action) do
+    {:ok, _notification} = CliSync.cli_mutation_performed(entity_type, entity_id, action)
+    :ok
+  end
+
+  # Bulk maintenance touched an unknown set of rows; a wildcard notification
+  # per entity type makes a running app reload its lists.
+  defp notify_bulk_change do
+    Enum.each(@bulk_entity_types, &notify(&1, "*", :updated))
+  end
+
+  defp split_list(nil), do: []
+
+  defp split_list(value) when is_binary(value) do
+    value
+    |> String.split(",")
+    |> Enum.map(&String.trim/1)
+    |> Enum.reject(&(&1 == ""))
+  end
+
+  defp json_list(value) when is_list(value), do: Enum.map(value, &to_string/1)
+  defp json_list(value) when is_binary(value), do: split_list(value)
+  defp json_list(_value), do: []
+
+  defp present(nil), do: nil
+
+  defp present(value) when is_binary(value) do
+    case String.trim(value) do
+      "" -> nil
+      trimmed -> trimmed
+    end
+  end
+
+  defp changeset_message(%Ecto.Changeset{} = changeset) do
+    changeset
+    |> Ecto.Changeset.traverse_errors(fn {message, opts} ->
+      Enum.reduce(opts, message, fn {key, value}, acc ->
+        String.replace(acc, "%{#{key}}", to_string(value))
+      end)
+    end)
+    |> Enum.map_join("; ", fn {field, messages} -> "#{field}: #{Enum.join(messages, ", ")}" end)
+  end
+
+  defp format_reason(reason) when is_binary(reason), do: reason
+  defp format_reason(%{message: message}) when is_binary(message), do: message
+  defp format_reason(%{guidance: guidance}) when is_binary(guidance), do: guidance
+  defp format_reason(reason), do: inspect(reason)
+end

lib/bds/cli/install.ex

@@ -0,0 +1,57 @@
+defmodule BDS.CLI.Install do
+  @moduledoc """
+  Installs the `bds-cli` launcher into `~/.local/bin` (issue #25), used by
+  the install buttons in the GUI and TUI settings.
+
+  The installed file is a two-line shim exec'ing the release's
+  `cli/bin/bds-cli` launcher (shipped via `rel/overlays`), so the CLI always
+  runs the same release — and therefore the same settings and cache
+  database — as the installed application.
+  """
+
+  @launcher_name "bds-cli"
+
+  @doc """
+  Writes the `~/.local/bin/bds-cli` shim. Returns `{:ok, installed_path}`,
+  or `{:error, :no_release}` when not running from a packaged release (dev
+  runs have no launcher to point at).
+  """
+  @spec install(keyword()) :: {:ok, Path.t()} | {:error, :no_release | File.posix()}
+  def install(opts \\ []) do
+    bin_dir = Keyword.get(opts, :bin_dir, Path.expand("~/.local/bin"))
+
+    with {:ok, launcher} <- launcher_path(Keyword.get(opts, :release_root)) do
+      installed = Path.join(bin_dir, @launcher_name)
+
+      with :ok <- File.mkdir_p(bin_dir),
+           :ok <- File.write(installed, shim_script(launcher)),
+           :ok <- File.chmod(installed, 0o755) do
+        {:ok, installed}
+      end
+    end
+  end
+
+  @doc """
+  The release's CLI launcher script, resolved from `RELEASE_ROOT` (set by
+  release scripts) or the code root dir (the release root when running a
+  release). `{:error, :no_release}` when neither contains the launcher.
+  """
+  @spec launcher_path(Path.t() | nil) :: {:ok, Path.t()} | {:error, :no_release}
+  def launcher_path(release_root \\ nil) do
+    [release_root, System.get_env("RELEASE_ROOT"), to_string(:code.root_dir())]
+    |> Enum.reject(&(&1 in [nil, ""]))
+    |> Enum.map(&Path.join([&1, "cli", "bin", @launcher_name]))
+    |> Enum.find(&File.regular?/1)
+    |> case do
+      nil -> {:error, :no_release}
+      path -> {:ok, path}
+    end
+  end
+
+  defp shim_script(launcher) do
+    """
+    #!/bin/sh
+    exec "#{launcher}" "$@"
+    """
+  end
+end

lib/bds/cli_sync.ex

@@ -54,6 +54,11 @@ defmodule BDS.CliSync do
      end)}
   end
 
+  def data_version do
+    %{rows: [[version]]} = Repo.query!("PRAGMA data_version", [])
+    version
+  end
+
   def prune_notifications(now \\ Persistence.now_ms()) when is_integer(now) do
     {processed_count, _} =
       Repo.delete_all(

lib/bds/cli_sync/watcher.ex

@@ -29,7 +29,12 @@ defmodule BDS.CliSync.Watcher do
           Keyword.get(opts, :poll_interval_ms),
           @default_poll_interval_ms
         ),
-      pubsub: Keyword.get(opts, :pubsub, BDS.PubSub)
+      pubsub: Keyword.get(opts, :pubsub, BDS.PubSub),
+      data_version_reader: Keyword.get(opts, :data_version_reader, &CliSync.data_version/0),
+      notification_fetcher:
+        Keyword.get(opts, :notification_fetcher, &CliSync.db_file_change_detected/0),
+      pruner: Keyword.get(opts, :pruner, &CliSync.prune_notifications/0),
+      last_data_version: nil
     }
 
     {:ok, schedule_poll(state)}
@@ -49,8 +54,13 @@ defmodule BDS.CliSync.Watcher do
   end
 
   defp process_notifications(state) do
-    {:ok, notifications} = CliSync.db_file_change_detected()
-    {:ok, _pruned} = CliSync.prune_notifications()
+    current_data_version = state.data_version_reader.()
+
+    if state.last_data_version == current_data_version do
+      %{state | last_data_version: current_data_version}
+    else
+      {:ok, notifications} = state.notification_fetcher.()
+      {:ok, _pruned} = state.pruner.()
 
       Enum.each(notifications, fn notification ->
         Phoenix.PubSub.broadcast(
@@ -60,7 +70,8 @@ defmodule BDS.CliSync.Watcher do
         )
       end)
 
-    state
+      %{state | last_data_version: current_data_version}
+    end
   end
 
   defp notification_payload(notification) do

lib/bds/desktop/automation.ex

@@ -2,6 +2,7 @@ defmodule BDS.Desktop.Automation do
   @moduledoc false
 
   use GenServer
+  require Logger
 
   @ready_timeout 60_000
   @request_timeout 30_000
@@ -13,7 +14,9 @@ defmodule BDS.Desktop.Automation do
   def stop_session(session) do
     GenServer.stop(session, :normal, @request_timeout)
   catch
-    :exit, _reason -> :ok
+    :exit, reason ->
+      Logger.debug("swallowed desktop automation stop_session exit: #{inspect(reason)}")
+      :ok
   end
 
   def snapshot(session) do
@@ -58,7 +61,6 @@ defmodule BDS.Desktop.Automation do
     base_url = BDS.Desktop.url(port)
 
     File.mkdir_p!(screenshot_dir)
-    ensure_http_client_started()
 
     app_port = start_app_process(project_root, port)
     :ok = wait_for_server(base_url)
@@ -221,7 +223,12 @@ defmodule BDS.Desktop.Automation do
   defp safe_driver_request(state, payload) do
     driver_request(state, payload)
   rescue
-    _error -> :ok
+    error ->
+      Logger.debug(
+        "swallowed desktop automation safe_driver_request error: #{inspect(error)} payload=#{inspect(payload)}"
+      )
+
+      :ok
   end
 
   defp shutdown_driver(state) do
@@ -319,8 +326,14 @@ defmodule BDS.Desktop.Automation do
   end
 
   defp do_wait_for_server(base_url, deadline) do
-    case :httpc.request(:get, {String.to_charlist(base_url <> "health"), []}, [], []) do
-      {:ok, {{_, 200, _}, _headers, _body}} ->
+    case Req.request(
+           method: :get,
+           url: base_url <> "health",
+           retry: false,
+           connect_options: [timeout: 1_000],
+           receive_timeout: 1_000
+         ) do
+      {:ok, %Req.Response{status: 200}} ->
         :ok
 
       _other ->
@@ -340,12 +353,6 @@ defmodule BDS.Desktop.Automation do
     port
   end
 
-  defp ensure_http_client_started do
-    _ = Application.ensure_all_started(:inets)
-    _ = Application.ensure_all_started(:ssl)
-    :ok
-  end
-
   defp await_port_exit(nil, _timeout), do: :ok
 
   defp await_port_exit(port, timeout) do
@@ -369,7 +376,9 @@ defmodule BDS.Desktop.Automation do
   defp safe_close_port(port) do
     Port.close(port)
   catch
-    :error, _reason -> :ok
+    :error, reason ->
+      Logger.debug("swallowed desktop automation safe_close_port error: #{inspect(reason)}")
+      :ok
   end
 
   defp normalize_simple_reply("ok"), do: :ok

lib/bds/desktop/deep_link.ex

@@ -1,15 +1,20 @@
 defmodule BDS.Desktop.DeepLink do
   @moduledoc """
   Receives OS URL-scheme events for the `bds2://` scheme and routes them to the
-  shell (spec: script.allium `BlogmarkReceived`).
+  live shell (spec: script.allium `BlogmarkReceived`).
 
   On macOS the `BDS2.app` bundle registers `bds2://` as a custom URL scheme via
   the `CFBundleURLTypes` entry in its `Info.plist` (built by `BDS.MacBundle` /
   `mix bds.bundle.macos`). When the browser bookmarklet navigates to
   `bds2://new-post?title=&url=`, the OS launches/raises the app and `Desktop.Env`
-  delivers an `{:open_url, [url]}` event. This GenServer subscribes to those
-  events and forwards recognised `bds2://` links to the live shell over PubSub,
-  where `BDS.Blogmark` turns them into draft posts.
+  relays erlang `:wx`'s `{:open_url, Url}` app event (where `Url` is the URL as a
+  charlist). This GenServer subscribes to those events and forwards recognised
+  `bds2://` links to the live shell.
+
+  Cold start matters here: when the bookmarklet *launches* the app, the deep
+  link arrives during startup, before the LiveView shell's websocket has
+  connected. Such links are queued and replayed the moment a shell registers via
+  `attach/2`; while a shell is connected, links are delivered to it directly.
 
   The `bds2://` scheme is distinct from the legacy app's `bds://` so the two
   installs do not contend for the same registration.
@@ -19,8 +24,6 @@ defmodule BDS.Desktop.DeepLink do
 
   require Logger
 
-  alias BDS.CliSync.Watcher
-
   @scheme "bds2://"
 
   def child_spec(opts) do
@@ -31,32 +34,69 @@ defmodule BDS.Desktop.DeepLink do
     GenServer.start_link(__MODULE__, opts, name: Keyword.get(opts, :name, __MODULE__))
   end
 
-  @impl true
-  def init(opts) do
-    pubsub = Keyword.get(opts, :pubsub, BDS.PubSub)
-    topic = Keyword.get(opts, :topic, Watcher.topic())
-
-    subscribe_to_env()
-
-    {:ok, %{pubsub: pubsub, topic: topic}}
+  @doc """
+  Registers the live shell `pid` as the deep-link sink and immediately replays
+  any links that arrived before a shell was connected. Future links are sent to
+  this pid until it dies, after which links queue again.
+  """
+  @spec attach(pid(), GenServer.server()) :: :ok
+  def attach(shell_pid, server \\ __MODULE__) when is_pid(shell_pid) do
+    GenServer.call(server, {:attach, shell_pid})
   end
 
-  # Desktop.Env delivers OS events as {event_name, args} tuples.
   @impl true
-  def handle_info({:open_url, [url | _rest]}, state) when is_binary(url) do
-    {:noreply, route(url, state)}
+  def init(_opts) do
+    subscribe_to_env()
+    {:ok, %{shell: nil, pending: []}}
+  end
+
+  @impl true
+  def handle_call({:attach, pid}, _from, state) do
+    Process.monitor(pid)
+
+    state.pending
+    |> Enum.reverse()
+    |> Enum.each(&send(pid, {:blogmark_deep_link, &1}))
+
+    {:reply, :ok, %{state | shell: pid, pending: []}}
+  end
+
+  # erlang's :wx delivers macOS app events as `{:open_url, Url}` where `Url` is
+  # the URL *string itself* — a charlist on current OTP, not a list of URLs
+  # (see `wx:subscribe_events/0`). Desktop.Env forwards it unchanged, so the
+  # payload must be normalised to a binary before routing.
+  @impl true
+  def handle_info({:open_url, payload}, state) do
+    {:noreply, route(to_url(payload), state)}
+  end
+
+  def handle_info({:DOWN, _ref, :process, pid, _reason}, %{shell: pid} = state) do
+    {:noreply, %{state | shell: nil}}
   end
 
   def handle_info(_message, state), do: {:noreply, state}
 
-  defp route(url, state) do
-    if String.starts_with?(url, @scheme) do
-      Phoenix.PubSub.broadcast(state.pubsub, state.topic, {:blogmark_deep_link, url})
-    else
-      Logger.debug("ignoring non-bds2 deep link: #{inspect(url)}")
-    end
+  # Accept the charlist wx actually sends, a bare binary, or a [binary | _] list
+  # (the shape Desktop.Env's docs imply), normalising all to a binary URL.
+  defp to_url(value) when is_binary(value), do: value
+  defp to_url([first | _]) when is_binary(first), do: first
+  defp to_url(value) when is_list(value), do: List.to_string(value)
+  defp to_url(_other), do: ""
 
+  defp route(url, state) do
+    cond do
+      not String.starts_with?(url, @scheme) ->
+        Logger.debug("ignoring non-bds2 deep link: #{inspect(url)}")
         state
+
+      is_pid(state.shell) and Process.alive?(state.shell) ->
+        send(state.shell, {:blogmark_deep_link, url})
+        state
+
+      true ->
+        # No shell connected yet (cold start) — hold the link until one attaches.
+        %{state | pending: [url | state.pending]}
+    end
   end
 
   # Desktop.Env is only present when the wx desktop adapter is running. Guard the
@@ -66,7 +106,9 @@ defmodule BDS.Desktop.DeepLink do
       try do
         Desktop.Env.subscribe()
       catch
-        :exit, _reason -> :ok
+        :exit, reason ->
+          Logger.debug("swallowed deep_link Desktop.Env.subscribe exit: #{inspect(reason)}")
+          :ok
       end
     end
 

lib/bds/desktop/dialogs.ex

@@ -0,0 +1,52 @@
+defmodule BDS.Desktop.Dialogs do
+  @moduledoc false
+
+  # Native single-line text prompt, same osascript approach as
+  # BDS.Desktop.FilePicker. Returns {:ok, text} | :cancel | {:error, map}.
+  def prompt_text(message, default \\ "") when is_binary(message) do
+    if System.get_env("BDS_DESKTOP_AUTOMATION") == "1" do
+      :cancel
+    else
+      case :os.type() do
+        {:unix, :darwin} -> prompt_text_macos(message, default)
+        _other -> {:error, %{message: "Dialogs are only supported on macOS desktop"}}
+      end
+    end
+  end
+
+  def alert(title, message) when is_binary(title) and is_binary(message) do
+    if System.get_env("BDS_DESKTOP_AUTOMATION") == "1" or :os.type() != {:unix, :darwin} do
+      :ok
+    else
+      script = "display alert \"#{escape(title)}\" message \"#{escape(message)}\""
+      _ = System.cmd("osascript", ["-e", script], stderr_to_stdout: true)
+      :ok
+    end
+  end
+
+  defp prompt_text_macos(message, default) do
+    script =
+      "text returned of (display dialog \"#{escape(message)}\" default answer \"#{escape(default)}\")"
+
+    case System.cmd("osascript", ["-e", script], stderr_to_stdout: true) do
+      {output, 0} -> {:ok, String.trim(output)}
+      {output, _status} -> normalize_failure(output)
+    end
+  end
+
+  defp normalize_failure(output) do
+    message = String.trim(output)
+
+    if message == "" or String.contains?(String.downcase(message), "canceled") do
+      :cancel
+    else
+      {:error, %{message: message}}
+    end
+  end
+
+  defp escape(value) do
+    value
+    |> String.replace("\\", "\\\\")
+    |> String.replace("\"", "\\\"")
+  end
+end

lib/bds/desktop/endpoint.ex

@@ -17,19 +17,14 @@ defmodule BDS.Desktop.Endpoint do
   plug(Plug.Static,
     at: "/assets",
     from: {:bds, "priv/static/assets"},
-    only: ["app.css", "app.js"]
-  )
-
-  plug(Plug.Static,
-    at: "/monaco",
-    from: {:bds, "priv/ui/monaco"},
-    only: ["vs"]
+    only: ["app.css", "app.js", "monaco.css", "monaco.js", "monaco"]
   )
 
   plug(BDS.Desktop.Router)
 
   defp maybe_require_desktop_auth(conn, _opts) do
-    if System.get_env("BDS_DESKTOP_AUTOMATION") in ["1", "true", "TRUE"] do
+    if System.get_env("BDS_DESKTOP_AUTOMATION") in ["1", "true", "TRUE"] or
+         not BDS.Server.desktop_auth_required?() do
       conn
     else
       Desktop.Auth.call(conn, [])

lib/bds/desktop/external_links.ex

@@ -1,12 +0,0 @@
-defmodule BDS.Desktop.ExternalLinks do
-  @moduledoc false
-
-  @github_url "https://github.com/rfc1437/bDS2"
-  @github_issues_url "#{@github_url}/issues"
-
-  @spec github_url() :: String.t()
-  def github_url, do: @github_url
-
-  @spec github_issues_url() :: String.t()
-  def github_issues_url, do: @github_issues_url
-end

lib/bds/desktop/layouts.ex

@@ -13,6 +13,7 @@ defmodule BDS.Desktop.Layouts do
         <title><%= @page_title || "Blogging Desktop Server" %></title>
         <meta name="csrf-token" content={Phoenix.Controller.get_csrf_token()} />
         <link phx-track-static rel="stylesheet" href="/assets/app.css" />
+        <link phx-track-static rel="stylesheet" href="/assets/monaco.css" />
       </head>
       <body>
         <%= @inner_content %>

lib/bds/desktop/main_window.ex

@@ -4,6 +4,7 @@ defmodule BDS.Desktop.MainWindow do
   use GenServer
 
   alias Desktop.Window
+  require Logger
 
   @window_id __MODULE__
   @server_name BDS.Desktop.MainWindow.Watcher
@@ -22,7 +23,9 @@ defmodule BDS.Desktop.MainWindow do
   def persist_now(timeout \\ 100) do
     GenServer.call(@server_name, :persist_bounds_now, timeout)
   catch
-    :exit, _reason -> :ok
+    :exit, reason ->
+      Logger.debug("swallowed main_window persist_now exit: #{inspect(reason)}")
+      :ok
   end
 
   def window_options(extra_opts \\ []) do
@@ -169,10 +172,17 @@ defmodule BDS.Desktop.MainWindow do
         end
       end)
     rescue
-      ErlangError -> nil
-      FunctionClauseError -> nil
+      error in ErlangError ->
+        Logger.debug("swallowed main_window restore_bounds error: #{inspect(error)}")
+        nil
+
+      error in FunctionClauseError ->
+        Logger.debug("swallowed main_window restore_bounds error: #{inspect(error)}")
+        nil
     catch
-      :exit, _reason -> nil
+      :exit, reason ->
+        Logger.debug("swallowed main_window restore_bounds exit: #{inspect(reason)}")
+        nil
     end
   end
 
@@ -190,7 +200,7 @@ defmodule BDS.Desktop.MainWindow do
   end
 
   defp config_dir do
-    case :filename.basedir(:user_config, "bds") do
+    case :filename.basedir(:user_config, "BDS2") do
       path when is_list(path) -> List.to_string(path)
       path -> path
     end

lib/bds/desktop/media_controller.ex

@@ -8,16 +8,45 @@ defmodule BDS.Desktop.MediaController do
   alias BDS.Projects
   alias BDS.Repo
 
+  @web_image_types ~w(image/jpeg image/png image/webp image/gif image/svg+xml image/avif)
+
   def thumbnail(conn, %{"media_id" => media_id} = params) do
-    case active_media_thumbnail(media_id, Map.get(params, "size")) do
-      {:ok, content_type, path} ->
+    send_media(conn, active_media_thumbnail(media_id, Map.get(params, "size")))
+  end
+
+  def file(conn, %{"media_id" => media_id}) do
+    send_media(conn, active_media_file(media_id))
+  end
+
+  defp send_media(conn, {:ok, content_type, path}) do
     conn
     |> Plug.Conn.put_resp_content_type(content_type)
     |> Plug.Conn.send_file(200, path)
-
-      :error ->
-        send_resp(conn, 404, "not found")
   end
+
+  defp send_media(conn, :error), do: send_resp(conn, 404, "not found")
+
+  # Serves the original image at full resolution; formats browsers cannot
+  # render inline fall back to the large thumbnail.
+  defp active_media_file(media_id) do
+    with %{} = project <- Projects.get_active_project(),
+         %MediaRecord{} = media <- Repo.get(MediaRecord, media_id),
+         true <- media.project_id == project.id,
+         true <- media.mime_type in @web_image_types,
+         absolute_path = Path.join(Projects.project_data_dir(project), media.file_path),
+         true <- File.exists?(absolute_path) do
+      {:ok, media.mime_type, absolute_path}
+    else
+      _other -> active_media_thumbnail(media_id, "large")
+    end
+  rescue
+    error in [Exqlite.Error, DBConnection.OwnershipError] ->
+      if match?(%Exqlite.Error{}, error) and
+           not String.contains?(Exception.message(error), "no such table") do
+        reraise error, __STACKTRACE__
+      end
+
+      :error
   end
 
   defp active_media_thumbnail(media_id, size) do

lib/bds/desktop/menu_bar.ex

@@ -2,7 +2,7 @@ defmodule BDS.Desktop.MenuBar do
   @moduledoc false
 
   use BDS.Desktop.MenuCompat
-  alias BDS.Desktop.{ExternalLinks, ShellData, Shutdown, UILocale}
+  alias BDS.Desktop.{ShellData, Shutdown, UILocale}
   alias BDS.UI.Commands
   alias BDS.UI.MenuBar, as: ShellMenuBar
   alias Desktop.OS
@@ -25,12 +25,7 @@ defmodule BDS.Desktop.MenuBar do
   def mount(menu) do
     UILocale.put(ShellData.ui_language())
 
-    {:ok,
-     Desktop.Menu.assign(
-       menu,
-       :groups,
-       groups(dev_mode?: Application.get_env(:bds, :dev_routes, false))
-     )}
+    {:ok, Desktop.Menu.assign(menu, :groups, groups(native_menu_opts()))}
   end
 
   @impl true
@@ -59,7 +54,7 @@ defmodule BDS.Desktop.MenuBar do
   end
 
   def handle_event("view_on_github", menu) do
-    OS.launch_default_browser(ExternalLinks.github_url())
+    OS.launch_default_browser("https://github.com/rfc1437/bDS2")
     {:noreply, menu}
   end
 
@@ -72,13 +67,60 @@ defmodule BDS.Desktop.MenuBar do
     {:noreply, menu}
   end
 
+  def handle_event("connect_server", menu) do
+    prompt =
+      dgettext("ui", "Server address (user@host or user@host:port), public-key auth:")
+
+    with {:ok, target} <- BDS.Desktop.Dialogs.prompt_text(prompt, "user@host"),
+         {:ok, url} <- BDS.Desktop.RemoteConnection.connect(target) do
+      Window.show(BDS.Desktop.MainWindow.window_id(), url)
+    else
+      :cancel ->
+        :ok
+
+      {:error, reason} ->
+        BDS.Desktop.Dialogs.alert(
+          dgettext("ui", "Connect to Server"),
+          dgettext("ui", "Connection failed: %{reason}",
+            reason: BDS.Desktop.RemoteConnection.format_reason(reason)
+          )
+        )
+    end
+
+    {:noreply, menu}
+  end
+
+  def handle_event("disconnect_server", menu) do
+    :ok = BDS.Desktop.RemoteConnection.disconnect()
+    Window.show(BDS.Desktop.MainWindow.window_id(), BDS.Desktop.url())
+    {:noreply, menu}
+  end
+
   def handle_event("open_data_folder", menu) do
     _ = BDS.Desktop.ShellCommands.execute("open_data_folder")
     {:noreply, menu}
   end
 
   def handle_event("report_issue", menu) do
-    OS.launch_default_browser(ExternalLinks.github_issues_url())
+    OS.launch_default_browser("https://github.com/rfc1437/bDS2/issues")
+    {:noreply, menu}
+  end
+
+  def handle_event("minimize", menu) do
+    with_frame(&:wxTopLevelWindow.iconize(&1, iconize: true))
+    {:noreply, menu}
+  end
+
+  def handle_event("zoom", menu) do
+    with_frame(fn frame ->
+      :wxTopLevelWindow.maximize(frame, maximize: not :wxTopLevelWindow.isMaximized(frame))
+    end)
+
+    {:noreply, menu}
+  end
+
+  def handle_event("bring_all_to_front", menu) do
+    with_frame(&:wxWindow.raise/1)
     {:noreply, menu}
   end
 
@@ -91,12 +133,7 @@ defmodule BDS.Desktop.MenuBar do
   def handle_info({:set_ui_locale, locale}, menu) do
     UILocale.put(locale)
 
-    {:noreply,
-     Desktop.Menu.assign(
-       menu,
-       :groups,
-       groups(dev_mode?: Application.get_env(:bds, :dev_routes, false))
-     )}
+    {:noreply, Desktop.Menu.assign(menu, :groups, groups(native_menu_opts()))}
   end
 
   def handle_info(_, menu) do
@@ -123,6 +160,32 @@ defmodule BDS.Desktop.MenuBar do
     end
   end
 
+  defp native_menu_opts do
+    [
+      dev_mode?: Application.get_env(:bds, :dev_routes, false),
+      window_menu?: OS.type() == MacOS
+    ]
+  end
+
+  defp with_frame(fun) do
+    case frame() do
+      nil ->
+        :ok
+
+      frame ->
+        :wx.set_env(Desktop.Env.wx_env())
+        fun.(frame)
+    end
+  end
+
+  defp frame do
+    try do
+      Window.frame(BDS.Desktop.MainWindow.window_id())
+    catch
+      :exit, _ -> nil
+    end
+  end
+
   defp normalize_item(%{separator: true}), do: %{separator: true}
 
   defp normalize_item(item) do
@@ -145,12 +208,15 @@ defmodule BDS.Desktop.MenuBar do
   defp group_label(:edit), do: dgettext("ui", "Edit")
   defp group_label(:view), do: dgettext("ui", "View")
   defp group_label(:blog), do: dgettext("ui", "Blog")
+  defp group_label(:window), do: dgettext("ui", "Window")
   defp group_label(:help), do: dgettext("ui", "Help")
 
   defp item_label(:new_post), do: dgettext("ui", "New Post")
   defp item_label(:import_media), do: dgettext("ui", "Import Media")
   defp item_label(:save), do: dgettext("ui", "Save")
   defp item_label(:open_in_browser), do: dgettext("ui", "Open in Browser")
+  defp item_label(:connect_server), do: dgettext("ui", "Connect to Server…")
+  defp item_label(:disconnect_server), do: dgettext("ui", "Disconnect from Server")
   defp item_label(:open_data_folder), do: dgettext("ui", "Open Data Folder")
   defp item_label(:close_tab), do: dgettext("ui", "Close Tab")
   defp item_label(:quit), do: dgettext("ui", "Quit")
@@ -188,8 +254,12 @@ defmodule BDS.Desktop.MenuBar do
   defp item_label(:fill_missing_translations), do: dgettext("ui", "Fill Missing Translations")
   defp item_label(:find_duplicates), do: dgettext("ui", "Find Duplicate Posts")
   defp item_label(:generate_sitemap), do: dgettext("ui", "Generate Site")
+  defp item_label(:force_render_site), do: dgettext("ui", "Force Render Site")
   defp item_label(:validate_site), do: dgettext("ui", "Validate Site")
   defp item_label(:upload_site), do: dgettext("ui", "Upload Site")
+  defp item_label(:minimize), do: dgettext("ui", "Minimize")
+  defp item_label(:zoom), do: dgettext("ui", "Zoom")
+  defp item_label(:bring_all_to_front), do: dgettext("ui", "Bring All to Front")
   defp item_label(:about), do: dgettext("ui", "About")
   defp item_label(:documentation), do: dgettext("ui", "Documentation")
   defp item_label(:api_documentation), do: dgettext("ui", "API Documentation")

lib/bds/desktop/remote_connection.ex

@@ -0,0 +1,180 @@
+defmodule BDS.Desktop.RemoteConnection do
+  @moduledoc """
+  GUI remote mode (issue #26, phase 5).
+
+  Connects the desktop app to a headless bDS2 server over the same SSH
+  channel (and the same public keys) the TUI uses: `:ssh.connect` with
+  public-key auth, then an OTP TCP/IP tunnel to the server's loopback HTTP
+  endpoint. The webview then loads the local tunnel end — the server never
+  exposes HTTP.
+
+  Client key material lives in the same private `ssh/` directory next to
+  the database (`BDS.Server.ssh_dir/0`): an `id_ed25519`/`id_rsa` identity
+  and a `known_hosts` written on first connect.
+  """
+
+  use GenServer
+  use Gettext, backend: BDS.Gettext
+
+  require Logger
+
+  @default_ssh_port 2222
+  @tunnel_timeout_ms 10_000
+
+  def start_link(opts \\ []) do
+    case Keyword.pop(opts, :name, __MODULE__) do
+      {nil, init_opts} -> GenServer.start_link(__MODULE__, init_opts)
+      {name, init_opts} -> GenServer.start_link(__MODULE__, init_opts, name: name)
+    end
+  end
+
+  @doc """
+  Parses `user@host[:port]` into connection parameters. The port is the
+  server's SSH port (default #{@default_ssh_port}).
+  """
+  @spec parse_target(String.t()) ::
+          {:ok, %{user: String.t(), host: String.t(), port: pos_integer()}}
+          | {:error, :invalid_target}
+  def parse_target(target) when is_binary(target) do
+    with [user, rest] when user != "" <- String.split(String.trim(target), "@", parts: 2),
+         {:ok, host, port} <- parse_host_port(rest) do
+      {:ok, %{user: user, host: host, port: port}}
+    else
+      _other -> {:error, :invalid_target}
+    end
+  end
+
+  defp parse_host_port(rest) do
+    case String.split(rest, ":", parts: 2) do
+      [host] when host != "" ->
+        {:ok, host, @default_ssh_port}
+
+      [host, port] when host != "" ->
+        case Integer.parse(port) do
+          {number, ""} when number > 0 -> {:ok, host, number}
+          _other -> :error
+        end
+
+      _other ->
+        :error
+    end
+  end
+
+  @doc "Connects and tunnels; returns the local URL the webview should load."
+  @spec connect(GenServer.server(), String.t()) :: {:ok, String.t()} | {:error, term()}
+  def connect(server \\ __MODULE__, target) do
+    GenServer.call(server, {:connect, target}, @tunnel_timeout_ms + 5_000)
+  end
+
+  @spec disconnect(GenServer.server()) :: :ok
+  def disconnect(server \\ __MODULE__) do
+    GenServer.call(server, :disconnect)
+  end
+
+  @spec status(GenServer.server()) :: :disconnected | {:connected, String.t(), String.t()}
+  def status(server \\ __MODULE__) do
+    GenServer.call(server, :status)
+  end
+
+  @doc "Human-readable connection error for menu/shell error reporting."
+  @spec format_reason(term()) :: String.t()
+  def format_reason(:invalid_target) do
+    dgettext("ui", "Use the form user@host or user@host:port.")
+  end
+
+  def format_reason(%{message: message}) when is_binary(message), do: message
+  def format_reason(reason), do: inspect(reason)
+
+  ## GenServer callbacks
+
+  @impl true
+  def init(opts) do
+    overrides = Keyword.get(opts, :test_overrides, [])
+
+    {:ok,
+     %{
+       conn: nil,
+       monitor: nil,
+       target: nil,
+       url: nil,
+       connect_fun: Keyword.get(overrides, :connect_fun, &:ssh.connect/3),
+       tunnel_fun: Keyword.get(overrides, :tunnel_fun, &:ssh.tcpip_tunnel_to_server/6),
+       close_fun: Keyword.get(overrides, :close_fun, &:ssh.close/1),
+       ssh_dir_fun: Keyword.get(overrides, :ssh_dir_fun, &BDS.Server.ssh_dir/0)
+     }}
+  end
+
+  @impl true
+  def handle_call({:connect, target}, _from, state) do
+    state = close_current(state)
+
+    with {:ok, parsed} <- parse_target(target),
+         {:ok, conn} <- do_connect(state, parsed),
+         {:ok, local_port} <- do_tunnel(state, conn) do
+      url = "http://127.0.0.1:#{local_port}/"
+
+      {:reply, {:ok, url},
+       %{
+         state
+         | conn: conn,
+           monitor: Process.monitor(conn),
+           target: String.trim(target),
+           url: url
+       }}
+    else
+      {:error, reason} = error ->
+        Logger.warning("Remote connection to #{inspect(target)} failed: #{inspect(reason)}")
+        {:reply, error, state}
+    end
+  end
+
+  def handle_call(:disconnect, _from, state) do
+    {:reply, :ok, close_current(state)}
+  end
+
+  def handle_call(:status, _from, %{conn: nil} = state) do
+    {:reply, :disconnected, state}
+  end
+
+  def handle_call(:status, _from, state) do
+    {:reply, {:connected, state.target, state.url}, state}
+  end
+
+  @impl true
+  def handle_info({:DOWN, monitor, :process, _pid, reason}, %{monitor: monitor} = state) do
+    Logger.warning("Remote SSH connection lost: #{inspect(reason)}")
+    {:noreply, %{state | conn: nil, monitor: nil, target: nil, url: nil}}
+  end
+
+  def handle_info(_message, state), do: {:noreply, state}
+
+  ## Internal helpers
+
+  defp do_connect(state, %{user: user, host: host, port: port}) do
+    ssh_dir = BDS.Server.ensure_ssh_dir!(state.ssh_dir_fun.())
+
+    state.connect_fun.(String.to_charlist(host), port,
+      user: String.to_charlist(user),
+      user_dir: String.to_charlist(ssh_dir),
+      auth_methods: ~c"publickey",
+      # First connect records the host key in <ssh_dir>/known_hosts;
+      # later connects verify against it (trust-on-first-use).
+      silently_accept_hosts: true,
+      connect_timeout: @tunnel_timeout_ms
+    )
+  end
+
+  defp do_tunnel(state, conn) do
+    remote_port = Application.get_env(:bds, :desktop)[:port] || 4010
+
+    state.tunnel_fun.(conn, ~c"127.0.0.1", 0, ~c"127.0.0.1", remote_port, @tunnel_timeout_ms)
+  end
+
+  defp close_current(%{conn: nil} = state), do: state
+
+  defp close_current(state) do
+    if state.monitor, do: Process.demonitor(state.monitor, [:flush])
+    _ = state.close_fun.(state.conn)
+    %{state | conn: nil, monitor: nil, target: nil, url: nil}
+  end
+end

lib/bds/desktop/router.ex

@@ -19,6 +19,7 @@ defmodule BDS.Desktop.Router do
 
     get("/health", HealthController, :show)
     get("/media-thumbnail/:media_id", MediaController, :thumbnail)
+    get("/media-file/:media_id", MediaController, :file)
 
     live_session :desktop_shell,
       root_layout: {BDS.Desktop.Layouts, :root} do

lib/bds/desktop/server.ex

@@ -1,17 +1,18 @@
 defmodule BDS.Desktop.Server do
   @moduledoc false
 
-  use GenServer
-
   def child_spec(opts) do
-    %{
-      id: __MODULE__,
-      start: {__MODULE__, :start_link, [opts]}
-    }
-  end
-
-  def start_link(opts) do
-    GenServer.start_link(__MODULE__, opts, name: __MODULE__)
+    Supervisor.child_spec(
+      {Bandit,
+       Keyword.merge(opts,
+         plug: BDS.Desktop.Endpoint,
+         scheme: :http,
+         ip: {127, 0, 0, 1},
+         port: port(),
+         startup_log: false
+       )},
+      id: __MODULE__
+    )
   end
 
   def url do
@@ -24,18 +25,4 @@ defmodule BDS.Desktop.Server do
       _other -> Application.get_env(:bds, :desktop)[:port] || 4010
     end
   end
-
-  @impl true
-  def init(_opts) do
-    {:ok, bandit_pid} =
-      Bandit.start_link(
-        plug: BDS.Desktop.Endpoint,
-        scheme: :http,
-        ip: {127, 0, 0, 1},
-        port: port(),
-        startup_log: false
-      )
-
-    {:ok, %{bandit_pid: bandit_pid}}
-  end
 end

lib/bds/desktop/shell_commands.ex

@@ -120,7 +120,7 @@ defmodule BDS.Desktop.ShellCommands do
       "rebuild_embedding_index",
       "Rebuild Embedding Index",
       "Embeddings",
-      fn report -> rebuild_embedding_index_work(project, report) end
+      fn report -> Maintenance.rebuild_embedding_index(project.id, on_progress: report) end
     )
   end
 
@@ -196,6 +196,14 @@ defmodule BDS.Desktop.ShellCommands do
     end)
   end
 
+  defp dispatch("rebuild_media_links", project, _params) do
+    queue_task(project, "rebuild_media_links", "Rebuild Media Links", "Maintenance", fn report ->
+      {:ok, result} = BDS.Media.rebuild_media_links(project.id, on_progress: report)
+      report.(1.0, "Media links rebuilt")
+      %{project_id: project.id, counts: %{media_links: result.links}}
+    end)
+  end
+
   defp dispatch("regenerate_missing_thumbnails", project, _params) do
     queue_task(
       project,
@@ -213,7 +221,7 @@ defmodule BDS.Desktop.ShellCommands do
   defp dispatch("rebuild_database", project, _params) do
     group_id = task_group_id("rebuild_database")
     attrs = %{group_id: group_id, group_name: "Maintenance"}
-    [first_step | remaining_steps] = rebuild_database_steps(project)
+    [first_step | remaining_steps] = Maintenance.full_rebuild_steps(project.id)
 
     {:ok, posts_task} =
       Tasks.submit_task(first_step.name, first_step.work, attrs)
@@ -239,18 +247,13 @@ defmodule BDS.Desktop.ShellCommands do
   end
 
   defp dispatch("generate_sitemap", project, _params) do
-    queue_task(project, "generate_sitemap", "Generate Site", "Generation", fn report ->
-      {:ok, generation} =
-        Generation.generate_site(project.id, @site_sections, on_progress: report)
+    queue_render_site(project, "generate_sitemap", "Render Site", [])
+  end
 
-      report.(1.0, "Generated site output")
-
-      %{
-        project_id: project.id,
-        sections: generation.sections,
-        generated_count: length(generation.generated_files)
-      }
-    end)
+  # Forced variant of the site render: ignores the stored content hashes and
+  # rewrites every output file, repairing any drift on disk.
+  defp dispatch("force_render_site", project, _params) do
+    queue_render_site(project, "force_render_site", "Force Render Site", force: true)
   end
 
   defp dispatch("validate_site", project, _params) do
@@ -262,6 +265,42 @@ defmodule BDS.Desktop.ShellCommands do
     end)
   end
 
+  defp dispatch("apply_site_validation", project, params) do
+    validation_report = normalize_apply_validation_report(BDS.MapUtils.attr(params, :report, %{}))
+    group_id = task_group_id("apply_site_validation")
+    attrs = %{group_id: group_id, group_name: "Apply Site Validation"}
+
+    {:ok, prepare_task} =
+      Tasks.submit_task(
+        "Prepare Validation Apply",
+        fn report ->
+          {:ok, preparation} =
+            Generation.prepare_validation_apply(project.id, validation_report,
+              on_progress: report
+            )
+
+          Map.put(preparation, :project_id, project.id)
+        end,
+        attrs
+      )
+
+    Task.start(fn ->
+      run_apply_validation_sequence(project, validation_report, group_id, attrs, prepare_task.id)
+    end)
+
+    {:ok,
+     %{
+       kind: "task_queued",
+       action: "apply_site_validation",
+       title: "Apply Site Validation",
+       message: "Apply Site Validation tasks queued",
+       project_id: project.id,
+       task_id: prepare_task.id,
+       task_group_id: group_id,
+       panel_tab: "tasks"
+     }}
+  end
+
   defp dispatch("metadata_diff", project, _params) do
     queue_task(project, "metadata_diff", "Metadata Diff", "Maintenance", fn report ->
       {:ok, metadata_diff} = Maintenance.metadata_diff(project.id, on_progress: report)
@@ -439,6 +478,207 @@ defmodule BDS.Desktop.ShellCommands do
     end
   end
 
+  defp queue_render_site(project, action, title, render_opts) do
+    group_id = task_group_id(action)
+    attrs = %{group_id: group_id, group_name: title}
+
+    {:ok, first_task} =
+      Tasks.submit_task(
+        section_task_name(:core),
+        fn report ->
+          {:ok, _result} =
+            Generation.render_site_section(
+              project.id,
+              :core,
+              [on_progress: report] ++ render_opts
+            )
+
+          report.(1.0, section_complete_message(:core))
+          :ok
+        end,
+        attrs
+      )
+
+    Task.start(fn -> run_render_site_sequence(project, group_id, attrs, render_opts) end)
+
+    {:ok,
+     %{
+       kind: "task_queued",
+       action: action,
+       title: title,
+       message: title <> " tasks queued",
+       project_id: project.id,
+       task_id: first_task.id,
+       task_group_id: group_id,
+       panel_tab: "tasks"
+     }}
+  end
+
+  defp run_render_site_sequence(project, group_id, attrs, render_opts) do
+    remaining_sections = [:single, :category, :tag, :date]
+
+    Enum.each(remaining_sections, fn section ->
+      {:ok, _task} =
+        Tasks.submit_task(
+          section_task_name(section),
+          fn report ->
+            {:ok, _result} =
+              Generation.render_site_section(
+                project.id,
+                section,
+                [on_progress: report] ++ render_opts
+              )
+
+            report.(1.0, section_complete_message(section))
+            :ok
+          end,
+          attrs
+        )
+    end)
+
+    section_names = Enum.map([:core | remaining_sections], &section_task_name/1)
+
+    with :ok <- wait_for_group_phase(group_id, section_names, @rebuild_phase_timeout) do
+      {:ok, _task} =
+        Tasks.submit_task(
+          "Build Search Index",
+          fn report ->
+            {:ok, _result} =
+              Generation.build_site_search_index(
+                project.id,
+                [on_progress: report] ++ render_opts
+              )
+
+            report.(1.0, "Build Search Index complete")
+            :ok
+          end,
+          attrs
+        )
+
+      wait_for_group_phase(group_id, ["Build Search Index"], @rebuild_phase_timeout)
+    end
+
+    :ok
+  end
+
+  defp run_apply_validation_sequence(project, validation_report, group_id, attrs, prepare_task_id) do
+    with :ok <-
+           wait_for_group_phase(group_id, ["Prepare Validation Apply"], @rebuild_phase_timeout),
+         {:ok, preparation} <- completed_task_result(prepare_task_id),
+         :ok <-
+           run_apply_validation_render_tasks(
+             project,
+             validation_report,
+             group_id,
+             attrs,
+             preparation
+           ) do
+      if validation_apply_changed?(preparation) do
+        :ok = run_apply_validation_refresh_task(project, group_id, attrs, :calendar)
+      end
+
+      submit_apply_validation_check_task(project, attrs)
+    else
+      _other -> :ok
+    end
+  end
+
+  defp run_apply_validation_render_tasks(project, validation_report, group_id, attrs, preparation) do
+    sections = Map.get(preparation, :sections_to_render, [])
+    task_names = Enum.map(sections, &section_task_name/1)
+
+    Enum.each(sections, fn section ->
+      task_name = section_task_name(section)
+
+      {:ok, _task} =
+        Tasks.submit_task(
+          task_name,
+          fn report ->
+            {:ok, _result} =
+              Generation.apply_validation_section(project.id, validation_report, section,
+                on_progress: report
+              )
+
+            report.(1.0, section_complete_message(section))
+            :ok
+          end,
+          attrs
+        )
+    end)
+
+    case task_names do
+      [] -> :ok
+      names -> wait_for_group_phase(group_id, names, @rebuild_phase_timeout)
+    end
+  end
+
+  defp run_apply_validation_refresh_task(project, group_id, attrs, kind) do
+    task_name = apply_validation_refresh_task_name(kind)
+
+    {:ok, _task} =
+      Tasks.submit_task(
+        task_name,
+        fn report ->
+          {:ok, _result} =
+            Generation.refresh_validation_ancillary_outputs(project.id, kind, on_progress: report)
+
+          report.(1.0, apply_validation_refresh_complete_message(kind))
+          :ok
+        end,
+        attrs
+      )
+
+    wait_for_group_phase(group_id, [task_name], @rebuild_phase_timeout)
+  end
+
+  defp submit_apply_validation_check_task(project, attrs) do
+    {:ok, _task} =
+      Tasks.submit_task(
+        "Validate Site",
+        fn report ->
+          {:ok, validation} =
+            Generation.validate_site(project.id, @site_sections, on_progress: report)
+
+          site_validation_result(project.id, validation)
+        end,
+        attrs
+      )
+
+    :ok
+  end
+
+  defp completed_task_result(task_id) do
+    case Tasks.get_task(task_id) do
+      %{status: :completed, result: result} when is_map(result) -> {:ok, result}
+      %{status: :failed, error: error} -> {:error, error}
+      _other -> {:error, :task_result_unavailable}
+    end
+  end
+
+  defp validation_apply_changed?(preparation) do
+    Map.get(preparation, :sections_to_render, []) != [] or
+      Map.get(preparation, :deleted_url_count, 0) > 0
+  end
+
+  defp section_task_name(:core), do: "Render Site Core"
+  defp section_task_name(:single), do: "Render Single Posts"
+  defp section_task_name(:category), do: "Render Category Archives"
+  defp section_task_name(:tag), do: "Render Tag Archives"
+  defp section_task_name(:date), do: "Render Date Archives"
+
+  defp section_complete_message(:core), do: "Render Site Core complete"
+  defp section_complete_message(:single), do: "Render Single Posts complete"
+
+  defp section_complete_message(:category),
+    do: "Render Category Archives complete"
+
+  defp section_complete_message(:tag), do: "Render Tag Archives complete"
+  defp section_complete_message(:date), do: "Render Date Archives complete"
+
+  defp apply_validation_refresh_task_name(:calendar), do: "Regenerate Calendar"
+
+  defp apply_validation_refresh_complete_message(:calendar), do: "Regenerate Calendar complete"
+
   defp translation_fill_enabled?(metadata) do
     ([metadata.main_language] ++ metadata.blog_languages)
     |> Enum.map(fn language ->
@@ -452,102 +692,6 @@ defmodule BDS.Desktop.ShellCommands do
     |> length() > 1
   end
 
-  defp rebuild_database_steps(project) do
-    [
-      %{
-        name: "Rebuild Posts From Files",
-        work: fn report ->
-          {:ok, posts} =
-            Maintenance.rebuild_from_filesystem(project.id, "post",
-              on_progress: report,
-              rebuild_embeddings: false
-            )
-
-          report.(1.0, "Post rebuild complete")
-          %{project_id: project.id, counts: %{posts: length(posts)}}
-        end
-      },
-      %{
-        name: "Rebuild Media From Files",
-        work: fn report ->
-          {:ok, media} =
-            Maintenance.rebuild_from_filesystem(project.id, "media", on_progress: report)
-
-          report.(1.0, "Media rebuild complete")
-          %{project_id: project.id, counts: %{media: length(media)}}
-        end
-      },
-      %{
-        name: "Rebuild Scripts From Files",
-        work: fn report ->
-          {:ok, scripts} =
-            Maintenance.rebuild_from_filesystem(project.id, "script", on_progress: report)
-
-          report.(1.0, "Script rebuild complete")
-          %{project_id: project.id, counts: %{scripts: length(scripts)}}
-        end
-      },
-      %{
-        name: "Rebuild Templates From Files",
-        work: fn report ->
-          {:ok, templates} =
-            Maintenance.rebuild_from_filesystem(project.id, "template", on_progress: report)
-
-          report.(1.0, "Template rebuild complete")
-          %{project_id: project.id, counts: %{templates: length(templates)}}
-        end
-      },
-      %{
-        name: "Rebuild Post Links",
-        work: fn report ->
-          :ok = Posts.rebuild_post_links(project.id, on_progress: report)
-          report.(1.0, "Post links rebuilt")
-          %{project_id: project.id}
-        end
-      },
-      %{
-        name: "Regenerate Missing Thumbnails",
-        work: fn report ->
-          result = BDS.Media.regenerate_missing_thumbnails(project.id, on_progress: report)
-          report.(1.0, "Missing thumbnails regenerated")
-          Map.put(result, :project_id, project.id)
-        end
-      },
-      %{
-        name: "Rebuild Embedding Index",
-        work: fn report -> rebuild_embedding_index_work(project, report) end
-      }
-    ]
-  end
-
-  defp rebuild_embedding_index_work(project, report) do
-    case Embeddings.rebuild_project(project.id, on_progress: report) do
-      {:ok, rebuilt_post_ids} ->
-        report.(1.0, "Embedding index rebuilt")
-
-        %{
-          project_id: project.id,
-          rebuilt_post_ids: rebuilt_post_ids,
-          rebuilt_count: length(rebuilt_post_ids)
-        }
-
-      {:error, reason} ->
-        {:error, embedding_error_message(reason)}
-    end
-  end
-
-  defp embedding_error_message(reason) do
-    detail =
-      case reason do
-        message when is_binary(message) -> message
-        {:embedding_backend_unavailable, _inner} -> "the embedding service did not start"
-        other -> inspect(other)
-      end
-
-    "Could not build the embedding index: #{detail}. The model is downloaded on first use, " <>
-      "so check your internet connection — or turn off semantic similarity in Settings."
-  end
-
   defp run_rebuild_sequence(_group_id, _attrs, []), do: :ok
 
   defp run_rebuild_sequence(group_id, attrs, [step | remaining_steps]) do
@@ -559,27 +703,62 @@ defmodule BDS.Desktop.ShellCommands do
     end
   end
 
-  defp wait_for_group_phase(_group_id, _names, timeout) when timeout <= 0, do: :timeout
-
   defp wait_for_group_phase(group_id, names, timeout) do
+    if timeout <= 0 do
+      :timeout
+    else
+      Phoenix.PubSub.subscribe(BDS.PubSub, Tasks.topic())
+
+      try do
+        case group_phase_status(group_id, names) do
+          :waiting -> wait_for_group_phase_message(group_id, names, timeout)
+          status -> status
+        end
+      after
+        Phoenix.PubSub.unsubscribe(BDS.PubSub, Tasks.topic())
+      end
+    end
+  end
+
+  defp wait_for_group_phase_message(group_id, names, timeout) do
+    started_at = System.monotonic_time(:millisecond)
+
+    receive do
+      {:task_terminal, task} ->
+        elapsed = System.monotonic_time(:millisecond) - started_at
+
+        cond do
+          task.group_id == group_id and task.name in names and task.status == :failed ->
+            :failed
+
+          task.group_id == group_id and task.name in names ->
+            case group_phase_status(group_id, names) do
+              :waiting ->
+                wait_for_group_phase_message(group_id, names, timeout - elapsed)
+
+              status ->
+                status
+            end
+
+          true ->
+            wait_for_group_phase_message(group_id, names, timeout - elapsed)
+        end
+    after
+      timeout ->
+        :timeout
+    end
+  end
+
+  defp group_phase_status(group_id, names) do
     tasks =
       BDS.Tasks.list_tasks()
       |> Enum.filter(&(&1.group_id == group_id and &1.name in names))
 
     cond do
-      length(tasks) < length(names) ->
-        Process.sleep(50)
-        wait_for_group_phase(group_id, names, timeout - 50)
-
-      Enum.any?(tasks, &(&1.status == :failed)) ->
-        :failed
-
-      Enum.all?(tasks, &(&1.status == :completed)) ->
-        :ok
-
-      true ->
-        Process.sleep(50)
-        wait_for_group_phase(group_id, names, timeout - 50)
+      length(tasks) < length(names) -> :waiting
+      Enum.any?(tasks, &(&1.status == :failed)) -> :failed
+      Enum.all?(tasks, &(&1.status == :completed)) -> :ok
+      true -> :waiting
     end
   end
 
@@ -605,6 +784,20 @@ defmodule BDS.Desktop.ShellCommands do
     "http://#{server.host}:#{server.port}/"
   end
 
+  defp normalize_apply_validation_report(report) when is_map(report) do
+    %{
+      sitemap_path: BDS.MapUtils.attr(report, :sitemap_path),
+      sitemap_changed: BDS.MapUtils.attr(report, :sitemap_changed, false),
+      missing_url_paths: BDS.MapUtils.attr(report, :missing_url_paths, []),
+      extra_url_paths: BDS.MapUtils.attr(report, :extra_url_paths, []),
+      updated_post_url_paths: BDS.MapUtils.attr(report, :updated_post_url_paths, []),
+      expected_url_count: BDS.MapUtils.attr(report, :expected_url_count, 0),
+      existing_html_url_count: BDS.MapUtils.attr(report, :existing_html_url_count, 0)
+    }
+  end
+
+  defp normalize_apply_validation_report(_report), do: %{}
+
   defp normalize_site_validation(report) do
     %{
       sitemap_path: report.sitemap_path,

lib/bds/desktop/shell_data.ex

@@ -91,32 +91,16 @@ defmodule BDS.Desktop.ShellData do
     end
   end
 
-  def assistant_cards do
-    [
-      %{
-        label: dgettext("ui", "Offline Gate"),
-        text: dgettext("ui", "Automatic AI actions stay gated by airplane mode.")
-      },
-      %{
-        label: dgettext("ui", "Filesystem Sync"),
-        text:
-          dgettext("ui", "Metadata flush, diffing, and rebuild hooks still need editor wiring.")
-      },
-      %{
-        label: dgettext("ui", "Desktop Runtime"),
-        text: dgettext("ui", "The app window is now served from LiveView state.")
-      }
-    ]
-  end
-
-  def editor_meta(task_status) do
+  # Accepts the caller's already-resolved locale so hot render paths never
+  # re-read the ui.language setting from the database.
+  def editor_meta(task_status, ui_language \\ nil) do
     [
       %{
         label: dgettext("ui", "Status"),
         value: task_status.running_task_message || dgettext("ui", "Idle")
       },
       %{label: dgettext("ui", "Mode"), value: dgettext("ui", "Offline")},
-      %{label: dgettext("ui", "Main Language"), value: ui_language()}
+      %{label: dgettext("ui", "Main Language"), value: ui_language || ui_language()}
     ]
   end
 
@@ -125,7 +109,7 @@ defmodule BDS.Desktop.ShellData do
       post_count: dashboard.post_stats.total_posts,
       media_count: dashboard.media_stats.media_count,
       theme_badge: "desktop-shell",
-      ui_language: Keyword.get(opts, :ui_language, ui_language()),
+      ui_language: Keyword.get_lazy(opts, :ui_language, &ui_language/0),
       offline_mode: Keyword.get(opts, :offline_mode, true),
       running_task_message: task_status.running_task_message,
       running_task_overflow: task_status.running_task_overflow,

lib/bds/desktop/shell_live/bridges.ex

@@ -5,11 +5,11 @@ defmodule BDS.Desktop.ShellLive.Bridges do
   import Phoenix.LiveView, only: [connected?: 1, send_update: 2]
 
   alias BDS.Desktop.ShellData
-  alias BDS.Desktop.ShellLive.{ChatEditor, PostEditor}
+  alias BDS.Desktop.ShellLive.{ChatEditor, MediaEditor, PostEditor}
   alias BDS.Desktop.ShellLive.{CliSync, SessionUtil}
   alias BDS.UI.Workbench
 
-  @refreshable_tab_meta_types [:import, :chat]
+  @refreshable_tab_meta_types [:import, :chat, :post, :media]
 
   @spec handle_info(tuple() | atom(), Phoenix.LiveView.Socket.t(), map()) ::
           {:noreply, Phoenix.LiveView.Socket.t()}
@@ -216,6 +216,26 @@ defmodule BDS.Desktop.ShellLive.Bridges do
     {:noreply, socket}
   end
 
+  def handle_info({:editor_translation_completed, :post, post_id, language}, socket, _callbacks) do
+    send_update(PostEditor,
+      id: "post-editor-#{post_id}",
+      action: :translation_completed,
+      language: language
+    )
+
+    {:noreply, socket}
+  end
+
+  def handle_info({:editor_translation_completed, :media, media_id, language}, socket, _callbacks) do
+    send_update(MediaEditor,
+      id: "media-editor-#{media_id}",
+      action: :translation_completed,
+      language: language
+    )
+
+    {:noreply, socket}
+  end
+
   def handle_info({:post_editor_apply_ai_suggestions, post_id, fields}, socket, _callbacks) do
     send_update(PostEditor,
       id: "post-editor-#{post_id}",
@@ -246,7 +266,7 @@ defmodule BDS.Desktop.ShellLive.Bridges do
 
           socket
           |> assign(:task_status, task_status)
-          |> assign(:editor_meta, ShellData.editor_meta(task_status))
+          |> assign(:editor_meta, ShellData.editor_meta(task_status, socket.assigns.page_language))
           |> assign(
             :status,
             ShellData.status_bar(

lib/bds/desktop/shell_live/chat_editor.ex

@@ -228,7 +228,7 @@ defmodule BDS.Desktop.ShellLive.ChatEditor do
       not is_nil(socket.assigns.request) ->
         build_data(socket)
 
-      socket.assigns.offline_mode ->
+      socket.assigns.offline_mode and not AI.airplane_endpoint_configured?() ->
         Notify.output(
           dgettext("ui", "Chat"),
           dgettext("ui", "Automatic AI actions stay gated by airplane mode."),
@@ -237,7 +237,7 @@ defmodule BDS.Desktop.ShellLive.ChatEditor do
 
         build_data(socket)
 
-      ModelSelection.needs_api_key?(false) ->
+      ModelSelection.needs_api_key?(socket.assigns.offline_mode) ->
         build_data(socket)
 
       true ->
@@ -543,10 +543,15 @@ defmodule BDS.Desktop.ShellLive.ChatEditor do
 
   @spec markdown_html(binary()) :: Phoenix.HTML.Safe.t()
   def markdown_html(content) when is_binary(content) do
+    # Match Earmark's defaults (GFM tables, strikethrough, autolinks); escape
+    # raw HTML to text rather than rendering it, as the old escape: true did.
     html =
-      case Earmark.as_html(content, escape: true) do
-        {:ok, rendered, _messages} -> rendered
-        {:error, rendered, _messages} -> rendered
+      case MDEx.to_html(content,
+             extension: [table: true, strikethrough: true, autolink: true],
+             render: [escape: true]
+           ) do
+        {:ok, rendered} -> rendered
+        {:error, _reason} -> ""
       end
       |> rewrite_external_images()
 
@@ -574,8 +579,7 @@ defmodule BDS.Desktop.ShellLive.ChatEditor do
   def chart_width(_max_value, _value), do: 0
 
   @spec truthy?(term()) :: boolean()
-  def truthy?(value) when value in [true, "true", 1, "1", "on"], do: true
-  def truthy?(_value), do: false
+  def truthy?(value), do: BDS.Values.truthy?(value)
 
   # ── HEEx components ───────────────────────────────────────────────────────
 
@@ -989,7 +993,9 @@ defmodule BDS.Desktop.ShellLive.ChatEditor do
       try do
         Ecto.Adapters.SQL.Sandbox.allow(BDS.Repo, self(), pid)
       rescue
-        _error -> :ok
+        error ->
+          Logger.debug("swallowed chat_editor allow_repo_sandbox error: #{inspect(error)}")
+          :ok
       end
     else
       :ok
@@ -1025,9 +1031,8 @@ defmodule BDS.Desktop.ShellLive.ChatEditor do
   defp present?(value) when is_binary(value), do: String.trim(value) != ""
   defp present?(value), do: not is_nil(value)
 
-  defp format_error(%{kind: :endpoint_not_configured}),
-    do: dgettext("ui", "Configure an API key in Settings to enable AI chat.")
-
+  # :endpoint_not_configured is handled by its own case clause before this is
+  # reached; the chat surface already shows the configuration hint.
   defp format_error(reason), do: inspect(reason)
 
   defp parse_integer(value) when is_integer(value), do: value

lib/bds/desktop/shell_live/chat_editor/message_build.ex

@@ -189,6 +189,8 @@ defmodule BDS.Desktop.ShellLive.ChatEditor.MessageBuild do
     |> mark_surfaces_expanded(assigns)
   end
 
+  # Only called from pending_user_message/2, which already narrows the
+  # request to %{message: binary}.
   defp persisted_user_message_for_request?(messages, %{message: message} = request)
        when is_binary(message) do
     messages
@@ -198,8 +200,6 @@ defmodule BDS.Desktop.ShellLive.ChatEditor.MessageBuild do
     end)
   end
 
-  defp persisted_user_message_for_request?(_messages, _request), do: false
-
   defp persisted_assistant_content_for_request?(messages, request, content)
        when is_binary(content) and content != "" do
     messages

lib/bds/desktop/shell_live/chat_editor/tool_surfaces.ex

@@ -303,6 +303,5 @@ defmodule BDS.Desktop.ShellLive.ChatEditor.ToolSurfaces do
 
   defp map_value(_map, _key, default), do: default
 
-  defp truthy?(value) when value in [true, "true", 1, "1", "on"], do: true
-  defp truthy?(_value), do: false
+  defp truthy?(value), do: BDS.Values.truthy?(value)
 end

lib/bds/desktop/shell_live/chat_editor_html/chat_editor.html.heex

@@ -62,7 +62,7 @@
         <h2><%= dgettext("ui", "API Key Required") %></h2>
         <p><%= dgettext("ui", "Configure an API key in Settings to enable AI chat.") %></p>
         <div class="api-key-form">
-          <button class="api-key-submit ui-button ui-button-primary" type="button" phx-click="open_chat_settings" phx-target={@myself}><%= dgettext("ui", "Open Settings") %></button>
+          <button class="api-key-submit primary ui-button ui-button-primary" type="button" phx-click="open_chat_settings" phx-target={@myself}><%= dgettext("ui", "Open Settings") %></button>
         </div>
       </div>
     <% else %>
@@ -154,7 +154,7 @@
 
       <form class="chat-input-wrapper flex items-end gap-2" phx-change="change_chat_editor_input" phx-submit="send_chat_editor_message" phx-target={@myself}>
         <textarea class="chat-input chat-surface-input ui-textarea" name="message" rows="1" placeholder={dgettext("ui", "Type a message...")} disabled={@chat_editor.is_streaming}><%= @chat_editor.input %></textarea>
-        <button class="chat-send-button ui-button ui-button-primary" data-testid="chat-send-button" type="button" phx-click="send_chat_editor_message" phx-target={@myself} disabled={@chat_editor.send_disabled?}>↑</button>
+        <button class="chat-send-button primary ui-button ui-button-primary" data-testid="chat-send-button" type="button" phx-click="send_chat_editor_message" phx-target={@myself}>↑</button>
       </form>
 
       <%= if @chat_editor.action_error do %>

lib/bds/desktop/shell_live/content_state.ex

@@ -0,0 +1,82 @@
+defmodule BDS.Desktop.ShellLive.ContentState do
+  @moduledoc false
+
+  import Phoenix.Component, only: [assign: 3]
+
+  alias BDS.AI
+  alias BDS.Desktop.ShellData
+  alias BDS.Desktop.ShellLive.{SidebarState, SocketState, TabHelpers, TaskLocalization, TitlebarMenu}
+
+  def refresh_content(socket, workbench) do
+    projects =
+      case ShellData.project_snapshot() do
+        {:ok, data} -> data
+        {:error, :not_ready} -> ShellData.default_project_snapshot()
+      end
+
+    dashboard =
+      case ShellData.dashboard(projects.active_project_id) do
+        {:ok, data} -> data
+        {:error, :not_ready} -> BDS.UI.Dashboard.empty_snapshot()
+      end
+
+    git_badge_count =
+      case ShellData.git_badge_count(projects.active_project_id) do
+        {:ok, count} -> count
+        {:error, :not_ready} -> 0
+      end
+
+    active_view_id = Atom.to_string(workbench.active_view)
+
+    sidebar_data =
+      case ShellData.sidebar_view(
+             projects.active_project_id,
+             active_view_id,
+             SidebarState.current_filters(socket, active_view_id)
+           ) do
+        {:ok, data} -> data
+        {:error, :not_ready} -> BDS.UI.Sidebar.view(nil, active_view_id, %{})
+      end
+
+    sidebar_data = SidebarState.merge_ui_state(socket, active_view_id, sidebar_data)
+
+    socket
+    |> assign(:projects, projects)
+    |> assign(:current_project, ShellData.current_project(projects))
+    |> assign(:dashboard, dashboard)
+    |> assign(:dashboard_timeline_entries, Map.get(dashboard, :timeline_entries, []))
+    |> assign(:dashboard_category_counts, Map.get(dashboard, :category_counts, []))
+    |> assign(:dashboard_recent_posts, Map.get(dashboard, :recent_posts, []))
+    |> assign(
+      :dashboard_tag_cloud_items,
+      ShellData.dashboard_tag_cloud_items(Map.get(dashboard, :tag_cloud_items, []))
+    )
+    |> assign(:git_badge_count, git_badge_count)
+    |> assign(:sidebar_data, sidebar_data)
+    |> SocketState.refresh_layout(workbench)
+  end
+
+  def reload_shell(socket, workbench) do
+    tab_meta = TabHelpers.sync_tab_meta(workbench, socket.assigns[:tab_meta] || %{})
+    raw_task_status = BDS.Tasks.status_snapshot()
+    page_language = socket.assigns[:page_language] || ShellData.ui_language()
+
+    offline_mode =
+      if Phoenix.LiveView.connected?(socket) do
+        Map.get(socket.assigns, :offline_mode, AI.airplane_mode?(true))
+      else
+        Map.get(socket.assigns, :offline_mode, true)
+      end
+
+    task_status = TaskLocalization.localize_task_status(raw_task_status, page_language)
+
+    socket
+    |> assign(:tab_meta, tab_meta)
+    |> assign(:task_status, task_status)
+    |> assign(:offline_mode, offline_mode)
+    |> assign(:supported_ui_languages, ShellData.supported_ui_languages())
+    |> assign(:menu_groups, socket.assigns[:menu_groups] || TitlebarMenu.groups())
+    |> assign(:titlebar_menu_item_index, socket.assigns[:titlebar_menu_item_index])
+    |> refresh_content(workbench)
+  end
+end

lib/bds/desktop/shell_live/gallery_import.ex

@@ -15,14 +15,7 @@ defmodule BDS.Desktop.ShellLive.GalleryImport do
   @spec start(list(String.t()), String.t(), String.t(), String.t(), integer(), pid()) :: :ok
   def start(paths, project_id, post_id, language, concurrency_limit, parent) do
     {:ok, metadata} = Metadata.get_project_metadata(project_id)
-    main_language = metadata.main_language || language
-    blog_languages = metadata.blog_languages || []
-
-    translate_targets =
-      [main_language | blog_languages]
-      |> Enum.reject(&(&1 == language or is_nil(&1)))
-      |> Enum.uniq()
-
+    translate_targets = translate_targets(metadata, language)
     {in_flight, remaining} = Enum.split(paths, concurrency_limit)
 
     tasks =
@@ -48,6 +41,36 @@ defmodule BDS.Desktop.ShellLive.GalleryImport do
     send(parent, {:add_images_complete, length(paths)})
   end
 
+  @doc """
+  The translation targets for AI-generated media texts: the project main
+  language plus all blog languages, minus the source `language`.
+  """
+  def translate_targets(metadata, language) do
+    main_language = metadata.main_language || language
+    blog_languages = metadata.blog_languages || []
+
+    [main_language | blog_languages]
+    |> Enum.reject(&(&1 == language or is_nil(&1)))
+    |> Enum.uniq()
+  end
+
+  @doc """
+  Imports a single file and runs the same best-effort AI enrichment
+  (title/alt/caption plus translations) as the gallery pipeline, without
+  linking the media to a post. Used by the CLI `media` command (issue #25).
+
+  Returns `{:ok, media, display_title}` or `{:error, reason}`.
+  """
+  def import_and_enrich(path, project_id, language, translate_targets) do
+    case Media.import_media(%{project_id: project_id, source_path: path}) do
+      {:ok, media} ->
+        {:ok, media, enrich_media(media, language, translate_targets)}
+
+      {:error, reason} ->
+        {:error, reason}
+    end
+  end
+
   defp drain_tasks(
          [],
          tasks,
@@ -167,18 +190,14 @@ defmodule BDS.Desktop.ShellLive.GalleryImport do
          translate_targets,
          parent
        ) do
+    # Linking is mandatory and MUST happen regardless of AI availability
+    # (airplane mode / no local model), mirroring the drag-drop chain and the
+    # old app: import -> link -> (optional) AI enrichment. Gating the link
+    # behind AI is what left galleries empty.
     with {:ok, media} <- Media.import_media(%{project_id: project_id, source_path: path}),
          true <- String.starts_with?(media.mime_type || "", "image/"),
-         {:ok, result} <- AI.analyze_image(media.id, language: language),
-         {:ok, _updated} <-
-           Media.update_media(media.id, %{
-             title: result.title,
-             alt: result.alt,
-             caption: result.caption
-           }),
          {:ok, _link} <- Media.link_media_to_post(media.id, post_id) do
-      translate_media_translations(media.id, translate_targets)
-      title = result.title || media.original_name
+      title = enrich_media(media, language, translate_targets)
       send(parent, {:add_image_processed, title})
     else
       false ->
@@ -190,6 +209,32 @@ defmodule BDS.Desktop.ShellLive.GalleryImport do
     end
   end
 
+  # Best-effort AI enrichment: analysis + metadata update + translations. Any
+  # failure (offline, no model) is logged and never unlinks the image. Returns
+  # the display title used for progress reporting.
+  defp enrich_media(media, language, translate_targets) do
+    case AI.analyze_image(media.id, language: language) do
+      {:ok, result} ->
+        case Media.update_media(media.id, %{
+               title: result.title,
+               alt: result.alt,
+               caption: result.caption
+             }) do
+          {:ok, _updated} ->
+            translate_media_translations(media.id, translate_targets)
+            result.title || media.original_name
+
+          {:error, reason} ->
+            Logger.warning("Media metadata update failed for #{media.id}: #{inspect(reason)}")
+            media.original_name
+        end
+
+      {:error, reason} ->
+        Logger.warning("AI image analysis skipped for #{media.id}: #{inspect(reason)}")
+        media.original_name
+    end
+  end
+
   defp translate_media_translations(_media_id, []), do: :ok
 
   defp translate_media_translations(media_id, [target | rest]) do

lib/bds/desktop/shell_live/git_handler.ex

@@ -0,0 +1,126 @@
+defmodule BDS.Desktop.ShellLive.GitHandler do
+  @moduledoc false
+
+  import Phoenix.Component, only: [assign: 3]
+
+  alias BDS.Desktop.ShellLive.{SocketState, TabHelpers, UrlState}
+  alias BDS.UI.Workbench
+
+  use Gettext, backend: BDS.Gettext
+
+  def run_action(socket, event) do
+    project_id = current_project_id(socket)
+
+    {label, result} =
+      case event do
+        "git_fetch" -> {dgettext("ui", "Fetch"), git_call(project_id, &BDS.Git.fetch/1)}
+        "git_pull" -> {dgettext("ui", "Pull"), git_call(project_id, &BDS.Git.pull/1)}
+        "git_push" -> {dgettext("ui", "Push"), git_call(project_id, &BDS.Git.push/1)}
+        "git_prune_lfs" -> {dgettext("ui", "Prune LFS"), prune_lfs(project_id)}
+      end
+
+    socket
+    |> append_git_result(label, result)
+    |> SocketState.refresh_sidebar(socket.assigns.workbench)
+  end
+
+  def commit(socket, "") do
+    socket
+    |> SocketState.append_output_entry(
+      dgettext("ui", "Commit"),
+      dgettext("ui", "Commit message is required"),
+      nil,
+      "error"
+    )
+    |> SocketState.refresh_sidebar(socket.assigns.workbench)
+  end
+
+  def commit(socket, message) do
+    case git_call(current_project_id(socket), &BDS.Git.commit_all(&1, message)) do
+      {:ok, _result} ->
+        workbench = close_git_diff_tabs(socket.assigns.workbench)
+        tab_meta = TabHelpers.sync_tab_meta(workbench, socket.assigns[:tab_meta] || %{})
+
+        socket
+        |> assign(:tab_meta, tab_meta)
+        |> SocketState.append_output_entry(dgettext("ui", "Commit"), message, nil, "info")
+        |> SocketState.refresh_sidebar(workbench)
+        |> UrlState.push()
+
+      {:error, reason} ->
+        socket
+        |> SocketState.append_output_entry(dgettext("ui", "Commit"), format_git_error(reason), nil, "error")
+        |> SocketState.refresh_sidebar(socket.assigns.workbench)
+    end
+  end
+
+  def initialize(socket, remote_url) do
+    project_id = current_project_id(socket)
+
+    case git_call(project_id, &BDS.Git.initialize_repo/1) do
+      {:ok, _repo} ->
+        _ = maybe_set_git_remote(project_id, remote_url)
+
+        socket
+        |> SocketState.append_output_entry(
+          dgettext("ui", "Initialize Git"),
+          dgettext("ui", "Repository initialized"),
+          nil,
+          "info"
+        )
+        |> SocketState.refresh_sidebar(socket.assigns.workbench)
+
+      {:error, reason} ->
+        socket
+        |> SocketState.append_output_entry(
+          dgettext("ui", "Initialize Git"),
+          format_git_error(reason),
+          nil,
+          "error"
+        )
+        |> SocketState.refresh_sidebar(socket.assigns.workbench)
+    end
+  end
+
+  def normalize_remote_url(value) do
+    case value |> to_string() |> String.trim() do
+      "" -> nil
+      url -> url
+    end
+  end
+
+  defp git_call(nil, _fun), do: {:error, :no_project}
+  defp git_call("default", _fun), do: {:error, :no_project}
+  defp git_call(project_id, fun) when is_binary(project_id), do: fun.(project_id)
+
+  defp prune_lfs(nil), do: {:error, :no_project}
+  defp prune_lfs("default"), do: {:error, :no_project}
+
+  defp prune_lfs(project_id) when is_binary(project_id),
+    do: BDS.Git.prune_lfs_cache(project_id, 10)
+
+  defp maybe_set_git_remote(_project_id, nil), do: :ok
+  defp maybe_set_git_remote(project_id, remote_url), do: BDS.Git.set_remote(project_id, remote_url)
+
+  defp append_git_result(socket, label, {:ok, _result}) do
+    SocketState.append_output_entry(socket, label, dgettext("ui", "Done"), nil, "info")
+  end
+
+  defp append_git_result(socket, label, {:error, reason}) do
+    SocketState.append_output_entry(socket, label, format_git_error(reason), nil, "error")
+  end
+
+  defp format_git_error(:no_project), do: dgettext("ui", "No active project")
+  defp format_git_error(%{message: message}) when is_binary(message), do: message
+  defp format_git_error(%{guidance: guidance}) when is_binary(guidance), do: guidance
+  defp format_git_error({:git_failed, message}) when is_binary(message), do: message
+  defp format_git_error(reason), do: inspect(reason)
+
+  defp close_git_diff_tabs(workbench) do
+    workbench.tabs
+    |> Enum.filter(&(&1.type == :git_diff))
+    |> Enum.reduce(workbench, fn tab, wb -> Workbench.close_tab(wb, :git_diff, tab.id) end)
+  end
+
+  defp current_project_id(socket), do: (socket.assigns[:projects] || %{})[:active_project_id]
+end

lib/bds/desktop/shell_live/git_run.ex

@@ -0,0 +1,130 @@
+defmodule BDS.Desktop.ShellLive.GitRun do
+  @moduledoc """
+  Live modal for streaming network git commands (fetch/pull/push).
+
+  Starts a `BDS.Git.Stream`, appends its stdout/stderr chunks as they arrive
+  (stderr rendered in red), shows a spinner while running and a pass/fail banner
+  from the exit status. Closing the modal cancels a still-running command, which
+  kills the OS process.
+  """
+
+  use Phoenix.Component
+
+  use Gettext, backend: BDS.Gettext
+
+  alias BDS.Git
+
+  @operations %{"git_fetch" => :fetch, "git_pull" => :pull, "git_push" => :push}
+
+  @doc "True when the shell event is a streaming network git action."
+  def network_event?(event), do: Map.has_key?(@operations, event)
+
+  @doc "Open the modal and start streaming the operation."
+  def start(socket, event, project_id) do
+    operation = Map.fetch!(@operations, event)
+
+    run =
+      case start_stream(project_id, operation) do
+        {:ok, pid, ref} ->
+          %{operation: operation, pid: pid, ref: ref, lines: [], status: :running}
+
+        {:error, reason} ->
+          %{
+            operation: operation,
+            pid: nil,
+            ref: nil,
+            lines: [{:stderr, error_text(reason)}],
+            status: {:done, 1}
+          }
+      end
+
+    assign(socket, :git_run, run)
+  end
+
+  @doc "Append a streamed chunk to the modal (newest first internally)."
+  def append(socket, ref, stream, chunk) do
+    case socket.assigns[:git_run] do
+      %{ref: ^ref, lines: lines} = run ->
+        assign(socket, :git_run, %{run | lines: [{stream, chunk} | lines]})
+
+      _other ->
+        socket
+    end
+  end
+
+  @doc "Mark the run finished with its exit status."
+  def done(socket, ref, status) do
+    case socket.assigns[:git_run] do
+      %{ref: ^ref} = run ->
+        assign(socket, :git_run, %{run | status: {:done, status}, pid: nil})
+
+      _other ->
+        socket
+    end
+  end
+
+  @doc "Close the modal, cancelling (killing) a still-running command."
+  def close(socket) do
+    case socket.assigns[:git_run] do
+      %{status: :running, pid: pid} when is_pid(pid) -> Git.Stream.cancel(pid)
+      _other -> :ok
+    end
+
+    assign(socket, :git_run, nil)
+  end
+
+  defp start_stream(nil, _operation), do: {:error, :no_project}
+  defp start_stream("default", _operation), do: {:error, :no_project}
+
+  defp start_stream(project_id, operation) when is_binary(project_id),
+    do: Git.stream(project_id, operation, self())
+
+  defp error_text(reason) when reason in [:no_project, :not_found],
+    do: dgettext("ui", "No active project") <> "\n"
+
+  defp error_text(reason), do: inspect(reason) <> "\n"
+
+  def git_run_modal(assigns) do
+    ~H"""
+    <%= if @git_run do %>
+      <div class="shell-overlay-backdrop git-run-backdrop" data-testid="git-run-backdrop" phx-window-keydown="git_run_keydown">
+        <button class="shell-overlay-dismiss" type="button" phx-click="git_run_close" aria-label={dgettext("ui", "Close")}></button>
+        <div class="git-run-modal" role="dialog" aria-modal="true">
+          <div class="git-run-header">
+            <h2 class="git-run-title">{title(@git_run.operation)}</h2>
+            <span class={["git-run-status", status_class(@git_run.status)]} data-testid="git-run-status">
+              {status_label(@git_run.status)}
+            </span>
+          </div>
+          <pre class="git-run-output" data-testid="git-run-output"><%= for {stream, text} <- Enum.reverse(@git_run.lines) do %><span class={line_class(stream)}>{text}</span><% end %></pre>
+          <div class="git-run-footer">
+            <button class="git-action-button" type="button" phx-click="git_run_close" data-testid="git-run-close">
+              {close_label(@git_run.status)}
+            </button>
+          </div>
+        </div>
+      </div>
+    <% end %>
+    """
+  end
+
+  defp title(:fetch), do: dgettext("ui", "git fetch")
+  defp title(:pull), do: dgettext("ui", "git pull")
+  defp title(:push), do: dgettext("ui", "git push")
+
+  defp line_class(:stderr), do: "git-run-line git-run-stderr"
+  defp line_class(:stdout), do: "git-run-line git-run-stdout"
+
+  defp status_class(:running), do: "running"
+  defp status_class({:done, 0}), do: "ok"
+  defp status_class({:done, _status}), do: "fail"
+
+  defp status_label(:running), do: dgettext("ui", "Running…")
+  defp status_label({:done, 0}), do: dgettext("ui", "Done")
+
+  defp status_label({:done, status}),
+    do: dgettext("ui", "Failed (exit %{status})", status: status)
+
+  defp close_label(:running), do: dgettext("ui", "Cancel")
+  defp close_label({:done, _status}), do: dgettext("ui", "Close")
+end

lib/bds/desktop/shell_live/import_editor.ex

@@ -6,6 +6,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
   alias BDS.{AI, ImportAnalysis, ImportDefinitions, ImportExecution}
   alias BDS.Desktop.{FilePicker, FolderPicker, ShellData}
   alias BDS.Desktop.ShellLive.Notify
+  require Logger
 
   alias BDS.Desktop.ShellLive.ImportEditor.{
     AnalysisState,
@@ -327,7 +328,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
       |> assign(:taxonomy_edit, %{
         type: type,
         name: name,
-        value: mapped_to |> to_string() |> blank_to_nil()
+        value: mapped_to |> to_string() |> BDS.MapUtils.blank_to_nil()
       })
       |> build_data()
 
@@ -434,7 +435,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
     socket =
       with %{} = definition <- ImportDefinitions.get_definition(definition_id),
            %{} = report <- ImportDefinitions.decode_analysis_result(definition) do
-        if socket.assigns.offline_mode? do
+        if socket.assigns.offline_mode? and not AI.airplane_endpoint_configured?() do
           notify_output(
             dgettext("ui", "Import"),
             BDS.Gettext.lgettext(
@@ -693,7 +694,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
             wxr_file_path: analysis_state.file_path,
             last_analysis_result: report
           }
-          |> maybe_put(:name, AnalysisState.suggested_definition_name(report))
+              |> BDS.MapUtils.maybe_put(:name, AnalysisState.suggested_definition_name(report))
 
         case ImportDefinitions.update_definition(definition_id, attrs) do
           {:ok, _definition} ->
@@ -839,7 +840,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
           <div class={["import-file-path", if(blank?(@import_editor.uploads_folder_path), do: "placeholder")]}>
             <%= @import_editor.uploads_folder_path || dgettext("ui", "No folder selected") %>
           </div>
-          <button type="button" phx-click="select_import_uploads_folder" phx-target={@myself}><%= dgettext("ui", "Open") %></button>
+          <button class="secondary ui-button ui-button-secondary" type="button" phx-click="select_import_uploads_folder" phx-target={@myself}><%= dgettext("ui", "Open") %></button>
         </div>
 
         <div class="import-file-row">
@@ -847,7 +848,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
           <div class={["import-file-path", if(blank?(@import_editor.wxr_file_path), do: "placeholder")]}>
             <%= @import_editor.wxr_file_path || dgettext("ui", "Select a file to analyze") %>
           </div>
-          <button class="import-analyze-btn" type="button" phx-click="select_import_wxr_file" phx-target={@myself}><%= dgettext("ui", "Select & Analyze") %></button>
+          <button class="import-analyze-btn primary ui-button ui-button-primary" type="button" phx-click="select_import_wxr_file" phx-target={@myself}><%= dgettext("ui", "Select & Analyze") %></button>
         </div>
       </div>
 
@@ -943,7 +944,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
               <%= if @counts.pages > 0 do %><span class="import-count-tag"><%= @counts.pages %> <%= dgettext("ui", "pages") %></span><% end %>
             </div>
 
-            <button class="import-execute-btn" type="button" phx-click="execute_import_editor" phx-target={@myself} disabled={@counts.total == 0}>
+            <button class="import-execute-btn primary ui-button ui-button-primary" type="button" phx-click="execute_import_editor" phx-target={@myself} disabled={@counts.total == 0}>
               <%= if @counts.total == 0 do %>
                 <%= dgettext("ui", "Nothing to Import") %>
               <% else %>
@@ -999,7 +1000,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
             <%= if @sections.taxonomy do %>
               <div class="taxonomy-analyze-row">
                 <div class="taxonomy-analyze-dropdown">
-                  <button class="taxonomy-analyze-btn" type="button" phx-click="toggle_import_ai_model_selector" phx-target={@myself}><%= dgettext("ui", "Analyze with...") %></button>
+                  <button class="taxonomy-analyze-btn secondary ui-button ui-button-secondary" type="button" phx-click="toggle_import_ai_model_selector" phx-target={@myself}><%= dgettext("ui", "Analyze with...") %></button>
                   <%= if @import_editor.model_selector_open? do %>
                     <div class="taxonomy-model-dropdown">
                       <%= for model <- @import_editor.available_models do %>
@@ -1011,7 +1012,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
                   <% end %>
                 </div>
 
-                <button class="taxonomy-analyze-btn" type="button" phx-click="analyze_import_taxonomy_ai" phx-target={@myself} disabled={Enum.empty?(@import_editor.available_models) and not @import_editor.offline?}>
+                <button class="taxonomy-analyze-btn secondary ui-button ui-button-secondary" type="button" phx-click="analyze_import_taxonomy_ai" phx-target={@myself} disabled={Enum.empty?(@import_editor.available_models) and not @import_editor.offline?}>
                   <%= @import_editor.selected_model_label %>
                 </button>
 
@@ -1356,12 +1357,12 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
                 class="taxonomy-mapping-input"
                 type="text"
                 name="mapped_to"
-                value={Map.get(@edit || %{}, :value, Map.get(item, :mapped_to) || "") || ""}
+                value={Map.get(@edit, :value, Map.get(item, :mapped_to) || "") || ""}
                 placeholder={dgettext("ui", "Map to...")}
                 list={"taxonomy-suggestions-#{@type}"}
                 autocomplete="off"
               />
-              <button class="taxonomy-edit-btn" type="submit" title={dgettext("ui", "Map to...")}>✓</button>
+              <button class="taxonomy-edit-btn secondary" type="submit" title={dgettext("ui", "Map to...")}>✓</button>
               <button class="taxonomy-edit-btn ghost" type="button" phx-click="cancel_import_taxonomy_edit" phx-target={@myself} title={dgettext("ui", "Cancel")}>×</button>
               <%= if present?(item.mapped_to) do %>
                 <button class="taxonomy-clear-btn" type="button" phx-click="clear_import_taxonomy_mapping" phx-target={@myself} phx-value-type={@type} phx-value-name={item.name} title={dgettext("ui", "Clear mapping")}>×</button>
@@ -1417,7 +1418,9 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
       try do
         Ecto.Adapters.SQL.Sandbox.allow(BDS.Repo, self(), pid)
       rescue
-        _error -> :ok
+        error ->
+          Logger.debug("swallowed import_editor allow_repo_sandbox error: #{inspect(error)}")
+          :ok
       end
     else
       :ok
@@ -1449,11 +1452,6 @@ defmodule BDS.Desktop.ShellLive.ImportEditor do
     Map.get(item, :resolution) in ["overwrite", "merge"]
   end
 
-  defp present?(value), do: value not in [nil, ""]
-  defp blank?(value), do: value in [nil, ""]
-  defp blank_to_nil(""), do: nil
-  defp blank_to_nil(value), do: value
-
-  defp maybe_put(map, _key, nil), do: map
-  defp maybe_put(map, key, value), do: Map.put(map, key, value)
+  defp present?(value), do: BDS.Values.present?(value)
+  defp blank?(value), do: BDS.Values.blank?(value)
 end

lib/bds/desktop/shell_live/import_editor/analysis_state.ex

@@ -3,6 +3,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
 
   alias BDS.{ImportAnalysis, ImportDefinitions, Metadata}
   alias BDS.Desktop.{FilePicker, FolderPicker}
+  require Logger
   use Gettext, backend: BDS.Gettext
 
   @spec change_definition(term(), term(), term()) :: term()
@@ -160,7 +161,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
                 wxr_file_path: analysis_state.file_path,
                 last_analysis_result: report
               }
-              |> maybe_put(:name, suggested_definition_name(report))
+              |> BDS.MapUtils.maybe_put(:name, suggested_definition_name(report))
 
             case ImportDefinitions.update_definition(definition_id, attrs) do
               {:ok, _definition} ->
@@ -274,17 +275,18 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
     get_in(report, [:site_info, :url]) || get_in(report, [:site_info, :title])
   end
 
-  @spec maybe_put(term(), term(), term()) :: term()
-  def maybe_put(map, _key, nil), do: map
-  def maybe_put(map, key, value), do: Map.put(map, key, value)
-
   @spec allow_repo_sandbox(term()) :: term()
   def allow_repo_sandbox(pid) when is_pid(pid) do
     if Code.ensure_loaded?(Ecto.Adapters.SQL.Sandbox) do
       try do
         Ecto.Adapters.SQL.Sandbox.allow(BDS.Repo, self(), pid)
       rescue
-        _error -> :ok
+        error ->
+          Logger.debug(
+            "swallowed import_editor analysis_state allow_repo_sandbox error: #{inspect(error)}"
+          )
+
+          :ok
       end
     else
       :ok
@@ -308,5 +310,5 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.AnalysisState do
   @spec translate_phase(term()) :: term()
   def translate_phase(other), do: other
 
-  defp present?(value), do: value not in [nil, ""]
+  defp present?(value), do: BDS.Values.present?(value)
 end

lib/bds/desktop/shell_live/import_editor/taxonomy_editing.ex

@@ -17,7 +17,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
         Map.put(socket.assigns.import_editor_taxonomy_edits, definition_id, %{
           type: type,
           name: name,
-          value: mapped_to |> to_string() |> blank_to_nil()
+          value: mapped_to |> to_string() |> BDS.MapUtils.blank_to_nil()
         })
       )
       |> reload.(socket.assigns.workbench)
@@ -82,7 +82,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
          %{} = definition <- ImportDefinitions.get_definition(definition_id),
          %{} = report <- ImportDefinitions.decode_analysis_result(definition) do
       cond do
-        socket.assigns.offline_mode ->
+        socket.assigns.offline_mode and not AI.airplane_endpoint_configured?() ->
           socket
           |> append_output.(
             dgettext("ui", "Import"),
@@ -150,7 +150,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
   @spec update_taxonomy_mapping(term(), term(), term(), term()) :: term()
   def update_taxonomy_mapping(report, type, name, mapped_to) do
     bucket_key = if(type == "categories", do: :categories, else: :tags)
-    normalized_value = mapped_to |> to_string() |> String.trim() |> blank_to_nil()
+    normalized_value = mapped_to |> to_string() |> String.trim() |> BDS.MapUtils.blank_to_nil()
 
     updated_report =
       update_in(report, [:items, bucket_key], fn items ->
@@ -229,7 +229,7 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
 
   @spec normalize_taxonomy_mapping_value(term(), term(), term()) :: term()
   def normalize_taxonomy_mapping_value(project_id, type, mapped_to) do
-    normalized_value = mapped_to |> to_string() |> String.trim() |> blank_to_nil()
+    normalized_value = mapped_to |> to_string() |> String.trim() |> BDS.MapUtils.blank_to_nil()
 
     case normalized_value do
       nil ->
@@ -284,7 +284,5 @@ defmodule BDS.Desktop.ShellLive.ImportEditor.TaxonomyEditing do
   def maybe_put_option(opts, _key, nil), do: opts
   def maybe_put_option(opts, key, value), do: Keyword.put(opts, key, value)
 
-  defp present?(value), do: value not in [nil, ""]
-  defp blank_to_nil(""), do: nil
-  defp blank_to_nil(value), do: value
+  defp present?(value), do: BDS.Values.present?(value)
 end

lib/bds/desktop/shell_live/index.html.heex

@@ -457,7 +457,7 @@
           <div class="panel-tabs flex min-w-0 items-center overflow-x-auto">
             <%= for tab <- @panel_tabs do %>
               <button
-                class={["panel-tab", "ui-tab", if(@workbench.panel.active_tab == tab, do: "ui-tab-active"), "inline-flex h-9 items-center px-3 text-xs uppercase tracking-wide", if(@workbench.panel.active_tab == tab, do: "active")]}
+                class={["panel-tab", "ui-tab", if(@workbench.panel.active_tab == tab, do: "ui-tab-active"), "inline-flex items-center px-3 text-xs uppercase tracking-wide", if(@workbench.panel.active_tab == tab, do: "active")]}
                 type="button"
                 phx-click="select_panel_tab"
                 phx-value-tab={tab}
@@ -531,7 +531,7 @@
             ><%= @assistant_prompt %></textarea>
 
             <button
-              class="assistant-sidebar-start-button ui-button ui-button-primary"
+              class="assistant-sidebar-start-button primary ui-button ui-button-primary"
               data-testid="assistant-start-button"
               type="submit"
               disabled={String.trim(@assistant_prompt || "") == ""}
@@ -540,16 +540,7 @@
             </button>
           </form>
 
-          <%= if Enum.empty?(@assistant_messages) do %>
-            <div class="assistant-sidebar-welcome min-h-0 flex-1 overflow-auto">
-              <%= for card <- @assistant_cards do %>
-                <section class="assistant-card flex flex-col gap-1">
-                  <strong><%= card.label %></strong>
-                  <span><%= card.text %></span>
-                </section>
-              <% end %>
-            </div>
-          <% else %>
+          <%= unless Enum.empty?(@assistant_messages) do %>
             <div class="assistant-sidebar-transcript min-h-0 flex-1 overflow-auto">
               <%= for message <- @assistant_messages do %>
                 <article
@@ -687,4 +678,6 @@
   </footer>
 
   <ShellOverlayComponents.shell_overlay shell_overlay={@shell_overlay} />
+  <LiveToast.toast_group flash={@flash} connected={assigns[:socket] != nil} toasts_sync={assigns[:toasts_sync]} corner={:bottom_right} toast_class_fn={&toast_class_fn/1} />
+  <GitRun.git_run_modal git_run={@git_run} />
 </div>

lib/bds/desktop/shell_live/media_editor.ex

@@ -7,7 +7,7 @@ defmodule BDS.Desktop.ShellLive.MediaEditor do
 
   alias BDS.Desktop.{FilePicker}
   alias BDS.Desktop.ShellLive.Notify
-  alias BDS.{AI, I18n, Media}
+  alias BDS.{AI, I18n, Media, Tasks}
   alias BDS.Media.Media, as: MediaRecord
   alias BDS.Media.Translation
   alias BDS.Posts.Post
@@ -57,6 +57,17 @@ defmodule BDS.Desktop.ShellLive.MediaEditor do
     {:ok, socket}
   end
 
+  def update(%{action: :translation_completed} = assigns, socket) do
+    socket =
+      socket
+      |> assign(Map.drop(assigns, [:action, :language]))
+      |> assign(:quick_actions_open?, false)
+      |> assign(:editing_translation, nil)
+      |> build_data()
+
+    {:ok, socket}
+  end
+
   def update(assigns, socket) do
     socket =
       socket
@@ -153,7 +164,7 @@ defmodule BDS.Desktop.ShellLive.MediaEditor do
   end
 
   def handle_event("detect_media_editor_language", _params, socket) do
-    if socket.assigns.offline_mode do
+    if socket.assigns.offline_mode and not AI.airplane_endpoint_configured?() do
       notify_output(
         socket,
         dgettext("ui", "Detect Language"),
@@ -346,7 +357,7 @@ defmodule BDS.Desktop.ShellLive.MediaEditor do
   def handle_event("refresh_media_translation", %{"language" => language}, socket) do
     media = socket.assigns.media
 
-    if socket.assigns.offline_mode do
+    if socket.assigns.offline_mode and not AI.airplane_endpoint_configured?() do
       notify_output(
         socket,
         dgettext("ui", "Translate"),
@@ -539,7 +550,7 @@ defmodule BDS.Desktop.ShellLive.MediaEditor do
   end
 
   defp do_translate(socket, language) do
-    if socket.assigns.offline_mode do
+    if socket.assigns.offline_mode and not AI.airplane_endpoint_configured?() do
       notify_output(
         socket,
         dgettext("ui", "Translate"),
@@ -552,25 +563,34 @@ defmodule BDS.Desktop.ShellLive.MediaEditor do
       media = socket.assigns.media
       normalized_language = normalize_language(language)
       source_language = normalize_language(media.language)
+      parent = self()
+
+      {:ok, _task} =
+        Tasks.submit_task(
+          "Translate Media to #{normalized_language}",
+          fn report ->
+            report.(0.1, "Translating media to #{normalized_language}")
+
+            with {:ok, translation} <-
+                   AI.translate_media(media.id, normalized_language,
+                     source_language: source_language
+                   ),
+                 {:ok, _saved_translation} <-
+                   Media.upsert_media_translation(media.id, normalized_language, translation) do
+              report.(1.0, "Media translation complete")
+              send(parent, {:editor_translation_completed, :media, media.id, normalized_language})
+              %{media_id: media.id, language: normalized_language}
+            else
+              {:error, reason} -> {:error, reason}
+            end
+          end,
+          %{group_id: media.project_id, group_name: "AI"}
+        )
 
-      case AI.translate_media(media.id, normalized_language, source_language: source_language) do
-        {:ok, translation} ->
-          case Media.upsert_media_translation(media.id, normalized_language, translation) do
-            {:ok, _saved_translation} ->
       socket
       |> assign(:quick_actions_open?, false)
       |> assign(:editing_translation, nil)
       |> build_data()
-
-            {:error, reason} ->
-              notify_output(socket, dgettext("ui", "Translate"), inspect(reason), "error")
-              |> build_data()
-          end
-
-        {:error, reason} ->
-          notify_output(socket, dgettext("ui", "Translate"), inspect(reason), "error")
-          |> build_data()
-      end
     end
   end
 
@@ -625,7 +645,7 @@ defmodule BDS.Desktop.ShellLive.MediaEditor do
 
   defp preview_url(%MediaRecord{} = media) do
     if image?(media),
-      do: "/media-thumbnail/#{media.id}?size=large&t=#{media.updated_at}",
+      do: "/media-file/#{media.id}?t=#{media.updated_at}",
       else: nil
   end
 

lib/bds/desktop/shell_live/media_editor_html/media_editor.html.heex

@@ -85,7 +85,7 @@
       <button class="secondary ui-button ui-button-secondary" type="button" phx-click="replace_media_editor_file" phx-target={@myself}>
         <%= dgettext("ui", "Replace File") %>
       </button>
-      <button class="ui-button ui-button-primary" data-testid="media-save-button" type="button" phx-click="save_media_editor" phx-target={@myself}>
+      <button class="primary ui-button ui-button-primary" data-testid="media-save-button" type="button" phx-click="save_media_editor" phx-target={@myself}>
         <%= dgettext("ui", "Save") %>
       </button>
       <button
@@ -211,7 +211,7 @@
       <div class="editor-field linked-posts-section flex flex-col gap-2">
         <label>
           <%= dgettext("ui", "Linked Posts") %>
-          <button class="add-link-btn" type="button" phx-click="toggle_media_post_picker" phx-target={@myself}>
+          <button class="add-link-btn secondary compact ui-button ui-button-secondary ui-button-compact" type="button" phx-click="toggle_media_post_picker" phx-target={@myself}>
             <%= dgettext("ui", "Link to Post") %>
           </button>
         </label>
@@ -296,7 +296,7 @@
         </form>
         <div class="translation-modal-footer flex items-center justify-end gap-2">
           <button class="secondary ui-button ui-button-secondary" type="button" phx-click="close_media_translation_editor" phx-target={@myself}><%= dgettext("ui", "Cancel") %></button>
-          <button class="ui-button ui-button-primary" type="button" phx-click="save_media_translation" phx-target={@myself}><%= dgettext("ui", "Save") %></button>
+          <button class="primary ui-button ui-button-primary" type="button" phx-click="save_media_translation" phx-target={@myself}><%= dgettext("ui", "Save") %></button>
         </div>
       </div>
     </div>

lib/bds/desktop/shell_live/misc_editor.ex

@@ -6,7 +6,7 @@ defmodule BDS.Desktop.ShellLive.MiscEditor do
   import Phoenix.HTML, only: [raw: 1]
   import Ecto.Query
 
-  alias BDS.{Embeddings, Generation, Git, HelpDocs, Posts, Repo}
+  alias BDS.{Embeddings, Git, HelpDocs, Posts, Repo}
   alias BDS.Desktop.ShellLive.Notify
   alias BDS.MapUtils
   alias BDS.Settings.Setting
@@ -77,7 +77,6 @@ defmodule BDS.Desktop.ShellLive.MiscEditor do
   def handle_event("apply_site_validation", _params, socket) do
     meta = meta(socket.assigns)
     payload = Map.get(meta, :payload, %{})
-    project_id = Map.get(meta, :project_id, socket.assigns.project_id)
 
     report = %{
       sitemap_path: Map.get(payload, :sitemap_path),
@@ -89,20 +88,7 @@ defmodule BDS.Desktop.ShellLive.MiscEditor do
       existing_html_url_count: Map.get(payload, :existing_html_url_count, 0)
     }
 
-    case Generation.apply_validation(project_id, report) do
-      {:ok, result} ->
-        notify_output(
-          dgettext("ui", "Site Validation"),
-          dgettext("ui", "Validation changes applied"),
-          inspect(result)
-        )
-
-        notify_command("validate_site")
-        {:noreply, socket}
-    end
-  rescue
-    error ->
-      notify_output(dgettext("ui", "Site Validation"), inspect(error), nil, "error")
+    notify_command("apply_site_validation", %{report: report})
     {:noreply, socket}
   end
 
@@ -278,10 +264,15 @@ defmodule BDS.Desktop.ShellLive.MiscEditor do
 
   @spec markdown_html(String.t()) :: Phoenix.HTML.safe()
   def markdown_html(content) do
+    # Match Earmark's defaults (GFM tables, strikethrough, autolinks); escape
+    # raw HTML to text rather than rendering it, as the old escape: true did.
     html =
-      case Earmark.as_html(content || "", escape: true) do
-        {:ok, rendered, _messages} -> rendered
-        {:error, rendered, _messages} -> rendered
+      case MDEx.to_html(content || "",
+             extension: [table: true, strikethrough: true, autolink: true],
+             render: [escape: true]
+           ) do
+        {:ok, rendered} -> rendered
+        {:error, _reason} -> ""
       end
 
     raw(html)

lib/bds/desktop/shell_live/native_menu_events.ex

@@ -0,0 +1,52 @@
+defmodule BDS.Desktop.ShellLive.NativeMenuEvents do
+  @moduledoc """
+  Native- and titlebar-menu LiveView events extracted from `BDS.Desktop.ShellLive`.
+
+  `ShellLive` routes the events listed in `events/0` here via a single delegating
+  `handle_event/3`, passing its `handle_native_menu_action/2` callback so the
+  menu-action dispatch logic stays owned by `ShellLive`.
+  """
+
+  alias BDS.Desktop.ShellLive.TitlebarMenu
+
+  @events ~w(
+    native_menu_action
+    titlebar_menu_keydown
+    toggle_titlebar_menu
+    hover_titlebar_menu
+    close_titlebar_menu
+    titlebar_menu_action
+  )
+
+  @doc "Event names handled by this module."
+  @spec events() :: [String.t()]
+  def events, do: @events
+
+  @typep socket :: Phoenix.LiveView.Socket.t()
+  @typep native_action :: (socket(), String.t() -> socket())
+
+  @spec handle(String.t(), map(), socket(), native_action()) :: {:noreply, socket()}
+  def handle("native_menu_action", %{"action" => action}, socket, native_action) do
+    {:noreply, native_action.(socket, action)}
+  end
+
+  def handle("titlebar_menu_keydown", %{"key" => key}, socket, native_action) do
+    {:noreply, TitlebarMenu.handle_keydown(socket, key, native_action)}
+  end
+
+  def handle("toggle_titlebar_menu", %{"group" => group}, socket, _native_action) do
+    {:noreply, TitlebarMenu.toggle(socket, group)}
+  end
+
+  def handle("hover_titlebar_menu", %{"group" => group}, socket, _native_action) do
+    {:noreply, TitlebarMenu.hover(socket, group)}
+  end
+
+  def handle("close_titlebar_menu", _params, socket, _native_action) do
+    {:noreply, TitlebarMenu.close(socket)}
+  end
+
+  def handle("titlebar_menu_action", %{"action" => action}, socket, native_action) do
+    {:noreply, socket |> TitlebarMenu.close() |> native_action.(action)}
+  end
+end

lib/bds/desktop/shell_live/notify.ex

@@ -20,6 +20,23 @@ defmodule BDS.Desktop.ShellLive.Notify do
     :ok
   end
 
+  @doc """
+  Sends an output entry to a specific LiveView process. Needed when the
+  caller runs in a different process than the shell — e.g. script output
+  callbacks invoked inside the sandboxed script process.
+  """
+  @spec output_to(pid(), String.t(), String.t(), String.t() | nil, String.t()) :: :ok
+  def output_to(pid, title, message, detail, level) when is_pid(pid) do
+    send(pid, {:editor_output, title, message, detail, level})
+    :ok
+  end
+
+  @spec alert(String.t(), String.t()) :: :ok
+  def alert(title, message) do
+    send(self(), {:shell_alert, title, message})
+    :ok
+  end
+
   @spec tab_meta(atom(), term(), String.t(), String.t()) :: :ok
   def tab_meta(type, id, title, subtitle) do
     send(self(), {:editor_tab_meta, type, id, %{title: title, subtitle: subtitle || ""}})

lib/bds/desktop/shell_live/overlay_components.ex

@@ -5,13 +5,19 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
   use Gettext, backend: BDS.Gettext
 
   import Ecto.Query
+  require Logger
 
-  alias BDS.{I18n, Media, Metadata, Posts, Repo}
+  alias BDS.{I18n, Media, Metadata, Posts, Repo, Slug, Strings}
   alias BDS.Media.Media, as: MediaRecord
   alias BDS.Media.Translation, as: MediaTranslation
   alias BDS.Posts.{Post, PostMedia, Translation}
   alias BDS.Tags.Tag
 
+  # Expected data/DB exceptions for the overlay fallbacks below. Narrowed (not a
+  # broad `rescue error ->`) so programmer bugs (MatchError, FunctionClauseError)
+  # surface unmodified instead of being swallowed into a fallback value.
+  @overlay_rescue [Ecto.NoResultsError, Ecto.QueryError, DBConnection.ConnectionError]
+
   embed_templates("overlay_html/*")
 
   def context(assigns, tab_title, tab_subtitle) do
@@ -70,7 +76,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
     {:ok, metadata} = Metadata.get_project_metadata(project_id)
     metadata
   rescue
-    _error -> %{main_language: "en", blog_languages: []}
+    error in @overlay_rescue ->
+      log_overlay_error("project metadata", error)
+      %{main_language: "en", blog_languages: []}
   end
 
   defp posts(nil), do: []
@@ -137,7 +145,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
         select: pm.media_id
     )
   rescue
-    _error -> []
+    error in @overlay_rescue ->
+      log_overlay_error("post media ids for #{post_id}", error)
+      []
   end
 
   defp post_media_ids(_tab), do: []
@@ -150,7 +160,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
     )
     |> Map.new(fn {language, status} -> {language, Atom.to_string(status || :draft)} end)
   rescue
-    _error -> %{}
+    error in @overlay_rescue ->
+      log_overlay_error("post translations for #{post_id}", error)
+      %{}
   end
 
   defp existing_translations(%{type: :media, id: media_id}) do
@@ -161,7 +173,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
     )
     |> Map.new(fn {language, status} -> {language, status} end)
   rescue
-    _error -> %{}
+    error in @overlay_rescue ->
+      log_overlay_error("media translations for #{media_id}", error)
+      %{}
   end
 
   defp existing_translations(_tab), do: %{}
@@ -179,7 +193,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
       _other -> metadata.main_language || "en"
     end
   rescue
-    _error -> metadata.main_language || "en"
+    error in @overlay_rescue ->
+      log_overlay_error("post source language for #{post_id}", error)
+      metadata.main_language || "en"
   end
 
   defp source_language(%{type: :media, id: media_id}, metadata) do
@@ -188,19 +204,16 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
       _other -> metadata.main_language || "en"
     end
   rescue
-    _error -> metadata.main_language || "en"
+    error in @overlay_rescue ->
+      log_overlay_error("media source language for #{media_id}", error)
+      metadata.main_language || "en"
   end
 
   defp source_language(_tab, metadata), do: metadata.main_language || "en"
 
   defp language_names do
-    %{
-      "en" => "English",
-      "de" => "Deutsch",
-      "fr" => "Francais",
-      "it" => "Italiano",
-      "es" => "Espanol"
-    }
+    I18n.supported_languages()
+    |> Enum.into(%{}, fn language -> {language.code, I18n.language_name(language.code)} end)
   end
 
   defp language_flags do
@@ -231,7 +244,7 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
           %{
             key: "slug",
             label: BDS.Gettext.lgettext(page_language, "ui", "Slug"),
-            current_value: post.slug || slugify(post.title || title),
+            current_value: post.slug || Slug.slugify(post.title || title),
             suggested_value: "",
             locked: post.status == :published,
             loading: true
@@ -242,7 +255,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
         []
     end
   rescue
-    _error -> []
+    error in @overlay_rescue ->
+      log_overlay_error("post AI fields for #{post_id}", error)
+      []
   end
 
   defp ai_fields(%{type: :media, id: media_id}, title, _subtitle, page_language) do
@@ -279,7 +294,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
         []
     end
   rescue
-    _error -> []
+    error in @overlay_rescue ->
+      log_overlay_error("media AI fields for #{media_id}", error)
+      []
   end
 
   defp ai_fields(_tab, _title, _subtitle, _page_language), do: []
@@ -309,7 +326,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
       reference_list: reference_list
     }
   rescue
-    _error ->
+    error in @overlay_rescue ->
+      log_overlay_error("delete media details for #{media_id}", error)
+
       %{
         title: BDS.Gettext.lgettext(page_language, "ui", "Delete Media"),
         entity_name: media_id,
@@ -330,7 +349,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
       reference_list: []
     }
   rescue
-    _error ->
+    error in @overlay_rescue ->
+      log_overlay_error("delete tag details", error)
+
       %{
         title: BDS.Gettext.lgettext(page_language, "ui", "Delete Tag"),
         entity_name: "tag",
@@ -367,7 +388,9 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
       message: BDS.Gettext.lgettext(page_language, "ui", "Cannot be undone.")
     }
   rescue
-    _error ->
+    error in @overlay_rescue ->
+      log_overlay_error("merge tag details for project #{project_id}", error)
+
       %{
         target: "tag",
         count: 1,
@@ -379,16 +402,10 @@ defmodule BDS.Desktop.ShellLive.OverlayComponents do
   defp canonical_post_url(post) do
     timestamp = post.published_at || post.updated_at || System.system_time(:millisecond)
     date = DateTime.from_unix!(timestamp, :millisecond)
-    "/#{date.year}/#{pad2(date.month)}/#{pad2(date.day)}/#{post.slug || post.id}"
+    "/#{date.year}/#{Strings.pad2(date.month)}/#{Strings.pad2(date.day)}/#{post.slug || post.id}"
   end
 
-  defp pad2(value), do: value |> Integer.to_string() |> String.pad_leading(2, "0")
-
-  defp slugify(value) do
-    value
-    |> to_string()
-    |> String.downcase()
-    |> String.replace(~r/[^a-z0-9]+/u, "-")
-    |> String.trim("-")
+  defp log_overlay_error(context, error) do
+    Logger.error("overlay component fallback for #{context}: #{Exception.message(error)}")
   end
 end

lib/bds/desktop/shell_live/overlay_html/shell_overlay.html.heex

@@ -39,8 +39,8 @@
             </div>
           </div>
           <div class="ai-suggestions-modal-footer">
-            <button class="button-cancel" type="button" phx-click="close_overlay"><%= dgettext("ui", "Cancel") %></button>
-            <button class="button-apply" type="button" phx-click="overlay_confirm"><%= dgettext("ui", "Apply Selected") %></button>
+            <button class="button-cancel secondary ui-button ui-button-secondary" type="button" phx-click="close_overlay"><%= dgettext("ui", "Cancel") %></button>
+            <button class="button-apply primary ui-button ui-button-primary" type="button" phx-click="overlay_confirm"><%= dgettext("ui", "Apply Selected") %></button>
           </div>
         </div>
       </div>
@@ -82,7 +82,7 @@
                 <span class="insert-modal-label"><%= dgettext("ui", "Display Text") %></span>
                 <input class="insert-modal-input" type="text" name="overlay[text]" value={@shell_overlay.external_text} />
               </label>
-              <button class="insert-modal-submit" type="button" phx-click="overlay_insert_external"><%= dgettext("ui", "Insert") %></button>
+              <button class="insert-modal-submit primary ui-button ui-button-primary" type="button" phx-click="overlay_insert_external"><%= dgettext("ui", "Insert") %></button>
             </form>
           <% end %>
         </div>
@@ -162,8 +162,8 @@
             <% end %>
           </div>
           <div class="confirm-delete-modal-footer">
-            <button class="button-cancel" type="button" phx-click="close_overlay"><%= dgettext("ui", "Cancel") %></button>
-            <button class="button-delete" type="button" phx-click="overlay_confirm"><%= dgettext("ui", "Delete") %></button>
+            <button class="button-cancel secondary ui-button ui-button-secondary" type="button" phx-click="close_overlay"><%= dgettext("ui", "Cancel") %></button>
+            <button class="button-delete danger ui-button ui-button-danger" type="button" phx-click="overlay_confirm"><%= dgettext("ui", "Delete") %></button>
           </div>
         </div>
       </div>
@@ -180,8 +180,25 @@
             <div class="confirm-delete-message"><%= @shell_overlay.message %></div>
           </div>
           <div class="confirm-delete-modal-footer">
-            <button class="button-cancel" type="button" phx-click="close_overlay"><%= dgettext("ui", "Cancel") %></button>
-            <button class="button-apply" type="button" phx-click="overlay_confirm"><%= dgettext("ui", "Confirm") %></button>
+            <button class="button-cancel secondary ui-button ui-button-secondary" type="button" phx-click="close_overlay"><%= dgettext("ui", "Cancel") %></button>
+            <button class="button-apply primary ui-button ui-button-primary" type="button" phx-click="overlay_confirm"><%= dgettext("ui", "Confirm") %></button>
+          </div>
+        </div>
+      </div>
+
+    <% :alert -> %>
+      <div class="shell-overlay-backdrop confirm-delete-modal-backdrop" data-testid="shell-overlay-backdrop" phx-window-keydown="overlay_keydown">
+        <button class="shell-overlay-dismiss" type="button" phx-click="close_overlay" aria-label={dgettext("ui", "Close")}></button>
+        <div class={["confirm-delete-modal", "alert-modal", "alert-modal-#{@shell_overlay.tone}"]} role="alertdialog" aria-modal="true">
+          <div class="confirm-delete-modal-header">
+            <h2><%= @shell_overlay.title %></h2>
+            <button class="confirm-delete-modal-close" type="button" phx-click="close_overlay">×</button>
+          </div>
+          <div class="confirm-delete-modal-body">
+            <div class="confirm-delete-message"><%= @shell_overlay.message %></div>
+          </div>
+          <div class="confirm-delete-modal-footer">
+            <button class="button-apply primary ui-button ui-button-primary" type="button" phx-click="close_overlay"><%= dgettext("ui", "OK") %></button>
           </div>
         </div>
       </div>

lib/bds/desktop/shell_live/overlay_manager.ex

@@ -66,7 +66,7 @@ defmodule BDS.Desktop.ShellLive.OverlayManager do
 
     socket =
       if kind == "ai_suggestions" and not is_nil(overlay) do
-        if socket.assigns.offline_mode do
+        if socket.assigns.offline_mode and not AI.airplane_endpoint_configured?() do
           callbacks.append_output.(
             socket,
             dgettext("ui", "AI Suggestions"),
@@ -155,7 +155,7 @@ defmodule BDS.Desktop.ShellLive.OverlayManager do
                  ShellOverlayComponents.markdown_link(result.title, result.canonical_url)}
               )
 
-              socket
+              assign(socket, :shell_overlay, nil)
           end
 
         {%{kind: :insert_media}, %{type: :post, id: post_id}} ->
@@ -172,7 +172,7 @@ defmodule BDS.Desktop.ShellLive.OverlayManager do
                 end
 
               Notify.parent({:post_editor_insert_content, post_id, syntax})
-              socket
+              assign(socket, :shell_overlay, nil)
           end
 
         _other ->
@@ -197,9 +197,10 @@ defmodule BDS.Desktop.ShellLive.OverlayManager do
 
           if details do
             Notify.parent({:post_editor_insert_content, post_id, details})
-          end
-
+            assign(socket, :shell_overlay, nil)
+          else
             socket
+          end
 
         _other ->
           socket
@@ -215,7 +216,7 @@ defmodule BDS.Desktop.ShellLive.OverlayManager do
       case {socket.assigns[:shell_overlay], current_tab} do
         {%{kind: :language_picker}, %{type: :post, id: post_id}} ->
           Notify.parent({:post_editor_translate, post_id, code})
-          socket
+          assign(socket, :shell_overlay, nil)
 
         {%{kind: :language_picker}, %{type: :media, id: media_id}} ->
           send_update(MediaEditor,
@@ -224,7 +225,7 @@ defmodule BDS.Desktop.ShellLive.OverlayManager do
             language: code
           )
 
-          socket
+          assign(socket, :shell_overlay, nil)
 
         _other ->
           socket

lib/bds/desktop/shell_live/panel_renderer.ex

@@ -10,6 +10,7 @@ defmodule BDS.Desktop.ShellLive.PanelRenderer do
   alias BDS.PostLinks
   alias BDS.Posts
   alias BDS.Posts.Post
+  alias BDS.UI.TaskGrouping
   use Gettext, backend: BDS.Gettext
 
   @doc "Render the active panel tab body."
@@ -48,34 +49,122 @@ defmodule BDS.Desktop.ShellLive.PanelRenderer do
   end
 
   defp render_task_entries(assigns) do
+    entries = TaskGrouping.build_task_entries(Map.get(assigns.task_status, :tasks, []))
+    collapsed = Map.get(assigns, :collapsed_task_groups) || MapSet.new()
+
+    assigns =
+      assigns
+      |> assign(:task_entries, entries)
+      |> assign(:collapsed_task_groups, collapsed)
+
     ~H"""
-    <%= if Enum.empty?(Map.get(@task_status, :tasks, [])) do %>
+    <%= if Enum.empty?(@task_entries) do %>
       <div class="panel-entry ui-panel-entry panel-empty-state ui-empty-state">
         <strong><%= dgettext("ui", "Tasks") %></strong>
         <span><%= dgettext("ui", "No background tasks running") %></span>
       </div>
     <% else %>
       <div class="task-list flex flex-col gap-2">
-        <%= for task <- Map.get(@task_status, :tasks, []) do %>
-          <div class="panel-entry ui-panel-entry task-entry flex flex-col gap-2">
-            <div class="task-entry-header flex items-center justify-between gap-2">
-              <strong><%= task.name %></strong>
-              <span class={"task-status task-status-#{task.status}"}><%= Map.get(task, :status_label, task.status |> to_string() |> String.capitalize()) %></span>
-            </div>
-            <span><%= task.message || task.group_name || "" %></span>
-            <%= if is_number(task.progress) do %>
-              <div class="task-progress-row">
-                <progress max="1" value={task.progress}></progress>
-                <span><%= Map.get(task, :progress_label, progress_percent(task.progress)) %></span>
-              </div>
+        <%= for entry <- @task_entries do %>
+          <%= case entry do %>
+            <% {:single, task} -> %>
+              {render_task_row(assigns, task, false)}
+            <% {:group, group_id, group_name, tasks} -> %>
+              {render_task_group(assigns, group_id, group_name, tasks)}
           <% end %>
-          </div>
         <% end %>
       </div>
     <% end %>
     """
   end
 
+  defp render_task_group(assigns, group_id, group_name, tasks) do
+    summary = TaskGrouping.summarize_task_group(tasks)
+    expanded = not MapSet.member?(assigns.collapsed_task_groups, group_id)
+
+    assigns =
+      assigns
+      |> assign(:group_id, group_id)
+      |> assign(:group_name, group_name)
+      |> assign(:group_tasks, tasks)
+      |> assign(:group_expanded, expanded)
+      |> assign(:group_meta, task_group_meta(summary))
+
+    ~H"""
+    <div class="task-group flex flex-col">
+      <button
+        class="panel-entry ui-panel-entry task-entry task-group-toggle flex w-full items-center gap-2 text-left"
+        type="button"
+        phx-click="toggle_task_group"
+        phx-value-group={@group_id}
+        aria-expanded={to_string(@group_expanded)}
+      >
+        <span class="task-group-chevron">{if @group_expanded, do: "▾", else: "▸"}</span>
+        <strong class="task-group-title"><%= @group_name %> (<%= length(@group_tasks) %>)</strong>
+        <span class="task-group-meta text-muted text-xs"><%= @group_meta %></span>
+      </button>
+      <%= if @group_expanded do %>
+        <%= for task <- @group_tasks do %>
+          {render_task_row(assigns, task, true)}
+        <% end %>
+      <% end %>
+    </div>
+    """
+  end
+
+  defp render_task_row(assigns, task, is_child) do
+    assigns =
+      assigns
+      |> assign(:task, task)
+      |> assign(:task_child?, is_child)
+
+    ~H"""
+    <div class={["panel-entry", "ui-panel-entry", "task-entry", "flex flex-col gap-2", if(@task_child?, do: "ml-4")]}>
+      <div class="task-entry-header flex items-center justify-between gap-2">
+        <strong><%= @task.name %></strong>
+        <span class={"task-status task-status-#{@task.status}"}><%= Map.get(@task, :status_label, @task.status |> to_string() |> String.capitalize()) %></span>
+      </div>
+      <span><%= @task.message || @task.group_name || "" %></span>
+      <%= if is_number(@task.progress) do %>
+        <div class="task-progress-row">
+          <progress max="1" value={@task.progress}></progress>
+          <span><%= Map.get(@task, :progress_label, progress_percent(@task.progress)) %></span>
+        </div>
+      <% end %>
+      <%= if @task.status == :running do %>
+        <div class="task-entry-actions flex justify-end">
+          <button
+            class="ui-button ui-button-secondary inline-flex items-center px-2 py-1 text-xs"
+            data-testid="cancel-task-button"
+            type="button"
+            phx-click="cancel_task"
+            phx-value-id={@task.id}
+          >
+            <%= dgettext("ui", "Cancel") %>
+          </button>
+        </div>
+      <% end %>
+    </div>
+    """
+  end
+
+  # "NN% · X Running · Y Pending" — the breakdown only lists non-zero counts,
+  # like the old app's summarizeTaskGroup rendering.
+  defp task_group_meta(summary) do
+    parts =
+      []
+      |> maybe_append_breakdown(summary.running, dgettext("ui", "Running"))
+      |> maybe_append_breakdown(summary.pending, dgettext("ui", "Pending"))
+
+    suffix = if parts == [], do: "", else: " · " <> Enum.join(parts, " · ")
+    progress_percent(summary.progress) <> suffix
+  end
+
+  defp maybe_append_breakdown(parts, count, _label) when count <= 0, do: parts
+
+  defp maybe_append_breakdown(parts, count, label),
+    do: parts ++ ["#{count} #{label}"]
+
   defp render_output_entries(assigns) do
     ~H"""
     <%= if Enum.empty?(@output_entries) do %>
@@ -84,6 +173,16 @@ defmodule BDS.Desktop.ShellLive.PanelRenderer do
         <span><%= dgettext("ui", "No shell output yet") %></span>
       </div>
     <% else %>
+      <div class="output-toolbar flex shrink-0 justify-end">
+        <button
+          class="ui-button ui-button-secondary inline-flex items-center px-2 py-1 text-xs"
+          data-testid="copy-output-button"
+          type="button"
+          phx-click="copy_output"
+        >
+          <%= dgettext("ui", "Copy") %>
+        </button>
+      </div>
       <div class="output-list flex flex-col gap-2">
         <%= for entry <- @output_entries do %>
           <div class={[
@@ -294,12 +393,11 @@ defmodule BDS.Desktop.ShellLive.PanelRenderer do
   defp short_commit_hash(hash) when is_binary(hash), do: String.slice(hash, 0, 7)
   defp short_commit_hash(_hash), do: "-------"
 
+  # Only called inside the template's `is_number(task.progress)` guard.
   defp progress_percent(progress) when is_number(progress) do
     rounded = progress |> Kernel.*(100) |> Float.round(0) |> trunc()
     "#{rounded}%"
   end
 
-  defp progress_percent(_), do: ""
-
-  defp present?(value), do: value not in [nil, ""]
+  defp present?(value), do: BDS.Values.present?(value)
 end

lib/bds/desktop/shell_live/post_editor.ex

@@ -3,16 +3,15 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
 
   use Phoenix.LiveComponent
 
-  alias BDS.{AI, Metadata, Posts, Preview}
+  alias BDS.{AI, Embeddings, Metadata, Posts, Preview, Tasks}
   alias BDS.Desktop.ShellData
   alias BDS.Desktop.ShellLive.{EditorImageDrop, Notify}
-  alias BDS.Desktop.ShellLive.PostEditor.{DraftManagement, ListValues, Persistence, PostMetadata}
   alias BDS.Posts.Post
   alias BDS.Tags
+  alias BDS.UI.PostEditor.{Draft, ListValues, Persistence}
 
-  import DraftManagement,
+  import Draft,
     only: [
-      current_draft: 4,
       editing_canonical_language?: 3,
       normalize_language: 2,
       normalize_mode: 1,
@@ -49,7 +48,7 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
 
   use Gettext, backend: BDS.Gettext
 
-  import PostMetadata,
+  import BDS.UI.PostEditor.Metadata,
     only: [
       blank?: 1,
       blank_to_nil: 1,
@@ -82,6 +81,15 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
     {:ok, socket}
   end
 
+  def update(%{action: :auto_save} = assigns, socket) do
+    socket =
+      socket
+      |> assign(Map.drop(assigns, [:action]))
+      |> do_save(true)
+
+    {:ok, socket}
+  end
+
   def update(%{action: :publish} = assigns, socket) do
     socket =
       socket
@@ -109,7 +117,6 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
         id: socket.assigns.post_id,
         content: content
       })
-      |> assign(:shell_overlay, nil)
 
     {:ok, socket}
   end
@@ -123,6 +130,15 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
     {:ok, socket}
   end
 
+  def update(%{action: :translation_completed, language: language} = assigns, socket) do
+    socket =
+      socket
+      |> assign(Map.drop(assigns, [:action, :language]))
+      |> apply_translation_completed(language)
+
+    {:ok, socket}
+  end
+
   def update(%{action: :apply_ai_suggestions, fields: fields} = assigns, socket) do
     socket =
       socket
@@ -279,6 +295,10 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
     {:noreply, do_detect_language(socket)}
   end
 
+  def handle_event("focus_post_editor_tags", _params, socket) do
+    {:noreply, socket |> load_tag_semantic_suggestions() |> build_data()}
+  end
+
   def handle_event("add_post_editor_tag", %{"tag" => tag}, socket) do
     {:noreply, do_add_list_value(socket, :tags, tag)}
   end
@@ -295,18 +315,6 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
     {:noreply, do_remove_list_value(socket, :categories, category)}
   end
 
-  def handle_event("insert_content", %{"content" => content}, socket) do
-    socket =
-      socket
-      |> Phoenix.LiveView.push_event("post-editor-insert-content", %{
-        id: socket.assigns.post_id,
-        content: content
-      })
-      |> assign(:shell_overlay, nil)
-
-    {:noreply, socket}
-  end
-
   def handle_event("close_quick_actions", _params, socket) do
     socket =
       socket
@@ -316,6 +324,19 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
     {:noreply, socket}
   end
 
+  # Semantic tag suggestions read the embeddings index (no live model call), so
+  # they work offline; suggest_tags/2 returns [] when similarity is disabled.
+  defp load_tag_semantic_suggestions(socket) do
+    case socket.assigns.post do
+      %Post{} = post ->
+        {:ok, suggestions} = Embeddings.suggest_tags(post.id, [])
+        assign(socket, :tag_semantic_suggestions, suggestions)
+
+      _other ->
+        socket
+    end
+  end
+
   defp component_current_draft(socket, post, metadata, active_language) do
     persisted = persisted_form(post, metadata, active_language)
     Map.get(socket.assigns.drafts, active_language, persisted)
@@ -335,6 +356,7 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
       active_language: canonical,
       drafts: %{},
       tag_query: "",
+      tag_semantic_suggestions: [],
       category_query: "",
       quick_actions_open?: false,
       mode: :markdown,
@@ -426,6 +448,11 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
               Tags.list_tags(post.project_id),
               socket.assigns.tag_query
             ),
+          tag_semantic_suggestions:
+            Enum.reject(
+              socket.assigns.tag_semantic_suggestions || [],
+              &(&1 in tag_values(form))
+            ),
           category_suggestions:
             category_suggestions(
               form,
@@ -451,7 +478,7 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
     end
   end
 
-  defp do_save(socket) do
+  defp do_save(socket, keep_draft? \\ false) do
     post = socket.assigns.post
 
     case post do
@@ -463,15 +490,26 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
         active_language = socket.assigns.active_language
         draft = component_current_draft(socket, post, metadata, active_language)
 
-        case persist(post, draft, active_language, metadata, :save) do
+        action = if keep_draft?, do: :auto_save, else: :save
+
+        case persist(post, draft, active_language, metadata, action) do
           {:ok, record} ->
             refreshed_post = Posts.get_post!(post.id)
             _refreshed_form = persisted_form(refreshed_post, metadata, active_language)
 
+            # Autosave keeps the working draft so the live editor stays the source
+            # of truth; only an explicit save drops it and reloads canonical body.
+            drafts =
+              if keep_draft? do
+                socket.assigns.drafts
+              else
+                Map.delete(socket.assigns.drafts, active_language)
+              end
+
             socket =
               socket
               |> assign(:post, refreshed_post)
-              |> assign(:drafts, Map.delete(socket.assigns.drafts, active_language))
+              |> assign(:drafts, drafts)
               |> assign(:save_state, save_state_for_action(:save))
               |> assign(:dirty?, false)
               |> build_data()
@@ -707,7 +745,7 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
   end
 
   defp do_detect_language(socket) do
-    if Map.get(socket.assigns, :offline_mode, true) do
+    if Map.get(socket.assigns, :offline_mode, true) and not AI.airplane_endpoint_configured?() do
       notify_output(
         socket,
         dgettext("ui", "Detect Language"),
@@ -756,7 +794,7 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
   end
 
   defp do_translate(socket, language) do
-    if Map.get(socket.assigns, :offline_mode, true) do
+    if Map.get(socket.assigns, :offline_mode, true) and not AI.airplane_endpoint_configured?() do
       notify_output(
         socket,
         dgettext("ui", "Translate"),
@@ -768,34 +806,56 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
       post_id = socket.assigns.post_id
       normalized_language = normalize_language(language, "")
       source_language = socket.assigns.canonical_language
+      project_id = socket.assigns.post.project_id
+      parent = self()
 
-      case AI.translate_post(post_id, normalized_language, source_language: source_language) do
-        {:ok, translation} ->
-          with {:ok, _saved_translation} <-
+      {:ok, _task} =
+        Tasks.submit_task(
+          "Translate Post to #{normalized_language}",
+          fn report ->
+            report.(0.1, "Translating post to #{normalized_language}")
+
+            with {:ok, translation} <-
+                   AI.translate_post(post_id, normalized_language,
+                     source_language: source_language
+                   ),
+                 {:ok, _saved_translation} <-
                    Posts.upsert_post_translation(post_id, normalized_language, %{
                      title: translation.title,
                      excerpt: translation.excerpt,
                      content: translation.content
                    }) do
-            socket =
+              report.(1.0, "Post translation complete")
+              send(parent, {:editor_translation_completed, :post, post_id, normalized_language})
+              %{post_id: post_id, language: normalized_language}
+            else
+              {:error, reason} -> {:error, reason}
+            end
+          end,
+          %{group_id: project_id, group_name: "AI"}
+        )
+
       socket
-              |> assign(:active_language, normalized_language)
-              |> assign(:drafts, Map.delete(socket.assigns.drafts, normalized_language))
       |> assign(:quick_actions_open?, false)
       |> build_data()
+    end
+  end
 
-            Notify.dirty(:post, post_id, false)
+  defp apply_translation_completed(socket, language) do
+    case Posts.get_post(socket.assigns.post_id) do
+      nil ->
+        build_data(socket)
+
+      %Post{} = post ->
+        socket =
           socket
-          else
-            {:error, reason} ->
-              notify_output(socket, dgettext("ui", "Translate"), inspect(reason), "error")
+          |> assign(:post, post)
+          |> assign(:active_language, language)
+          |> assign(:drafts, Map.delete(socket.assigns.drafts, language))
           |> build_data()
-          end
 
-        {:error, reason} ->
-          notify_output(socket, dgettext("ui", "Translate"), inspect(reason), "error")
-          |> build_data()
-      end
+        Notify.dirty(:post, post.id, false)
+        socket
     end
   end
 
@@ -819,7 +879,7 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
           end)
 
         if map_size(attrs) == 0 do
-          assign(socket, :shell_overlay, nil)
+          socket
         else
           case Posts.update_post(post_id, attrs) do
             {:ok, updated_post} ->
@@ -837,7 +897,6 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
                 )
                 |> assign(:save_state, :dirty)
                 |> assign(:dirty?, true)
-                |> assign(:shell_overlay, nil)
                 |> build_data()
 
               Notify.dirty(:post, post_id, true)
@@ -941,7 +1000,7 @@ defmodule BDS.Desktop.ShellLive.PostEditor do
     active_language = socket.assigns.active_language
     post = socket.assigns.post
     metadata = socket.assigns.project_metadata
-    draft = current_draft(socket.assigns, post, metadata, active_language)
+    draft = component_current_draft(socket, post, metadata, active_language)
     updated = Map.put(draft, field, value)
     assign(socket, :drafts, Map.put(socket.assigns.drafts, active_language, updated))
   end