From 428de84c8fe41969cace1f3b6991d60c24b76447 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 21 Feb 2026 23:01:14 +0300
Subject: [PATCH 01/54] fix: up

---
 knowledge-base/Artifacts v1.0.md              | 715 ++++++++++++++++++
 .../artifacts-v1-migration-plan-2026-02-21.md | 238 ++++++
 2 files changed, 953 insertions(+)
 create mode 100644 knowledge-base/Artifacts v1.0.md
 create mode 100644 knowledge-base/artifacts-v1-migration-plan-2026-02-21.md

diff --git a/knowledge-base/Artifacts v1.0.md b/knowledge-base/Artifacts v1.0.md
new file mode 100644
index 00000000..e6ff9bc5
--- /dev/null
+++ b/knowledge-base/Artifacts v1.0.md	
@@ -0,0 +1,715 @@
+ # Artifacts v1.0 — единая система эффектов (Prompt + UI + Canonicalization)
+
+## 0. Цели и границы
+
+### Цель
+
+Система **Artifacts** — единый механизм, который:
+
+1. хранит данные (значения и историю),
+2. детерминированно применяет их к **Prompt** и/или **UI**,
+3. умеет **переписывать** текст текущего user/assistant turn (canonicalization) без отдельного типа эффектов,
+4. убирает необходимость в двух отдельных контрактах:
+
+* `Prompt-time effects`
+* `Turn canonicalization effects`
+
+### Нормы этого документа
+
+* Используются слова **MUST / MUST NOT / SHOULD** в смысле RFC.
+* Система должна быть **детерминированной**: при одинаковом входе результат одинаковый.
+
+---
+
+## 1. Термины
+
+### Artifact
+
+**Artifact** — именованная сущность данных, результат работы операций.
+Идентификатор: **tag** (уникален в профиле).
+
+### Artifact event (Write / Emit)
+
+**Artifact event** — факт записи значения в артефакт (в рамках запуска/turn).
+Операции **не меняют prompt напрямую**, они **эмитят события**.
+
+### View (представление)
+
+**View** — правило, как события артефакта материализуются:
+
+* в **prompt** (инъекции/переписывания/виртуальные сообщения),
+* в **UI** (inline-парты в сообщениях),
+* в **UI panel** (отдельный интерфейс/панель с лентой).
+
+### Part
+
+**Part** — атомарный фрагмент сообщения (Entry Variant), который:
+
+* отображается в UI (renderer),
+* и/или сериализуется в prompt (serializer),
+* имеет порядок, видимость, lifespan/TTL и т.д.
+
+
+### Turn
+
+**Turn** — один шаг диалога (обычно один user entry → один assistant entry).
+Система использует `turnIndex` (целое число, монотонно растёт).
+
+---
+
+## 2. Инварианты и гарантии
+
+### 2.1. Уникальность tag
+
+* `Artifact.tag` MUST быть уникален **в рамках OperationProfile**.
+* Формат tag MUST быть dot-path:
+
+  * `segment.segment.segment`
+  * каждый segment: `^[a-z][a-z0-9_]*$`
+  * общая длина ≤ 128
+* Зарезервированный префикс: `__sys.` (для внутренних артефактов/служебных данных).
+
+### 2.2. Один контракт эффектов
+
+* Операции MUST эмитить **только** `artifact.emit`.
+* Операции MUST NOT эмитить отдельные `prompt_time` или `turn_canonicalization`.
+
+### 2.3. Детерминизм и отсутствие гонок записи
+
+* Все записи MUST применяться **последовательно** в одном детерминированном порядке (см. раздел 6).
+* Конкурентное выполнение операций разрешено, но **коммит всегда последовательный**.
+
+---
+
+## 3. Модель данных
+
+Ниже — “логическая” модель. Реальная БД может отличаться, но API и смысл — такие.
+
+### 3.1. ArtifactDefinition (описание артефакта)
+
+Определяется один раз (в профиле) и используется всеми операциями.
+
+```ts
+type ArtifactUsage = "prompt_only" | "ui_only" | "prompt+ui" | "internal";
+type ArtifactPersistence = "run_only" | "persisted";
+type ArtifactSemantics = "state" | "log/feed" | "lore/memory" | "intermediate" | (string & {});
+
+type ArtifactDefinition = {
+  tag: string;                 // уникальный id
+  title: string;
+  description?: string;
+
+  usage: ArtifactUsage;        // строго валидируется против наличия views
+  persistence: ArtifactPersistence;
+  semantics: ArtifactSemantics;
+
+  valueFormat: "text" | "markdown" | "json";  // “канонический” формат значения
+  schemaId?: string;            // для json (опционально)
+
+  history: {
+    enabled: boolean;           // если false — история не хранится
+    maxItems: number;           // жесткий лимит, напр. 0..1000
+  };
+
+  // Главная часть: как это проецируется в prompt/ui
+  views: ArtifactView[];
+};
+```
+
+### 3.2. ArtifactRecord (состояние артефакта)
+
+```ts
+type ArtifactValueEnvelope = {
+  format: "text" | "markdown" | "json";
+  value: string | object | number | boolean | null;
+
+  schemaId?: string;
+};
+
+type ArtifactHistoryItem = {
+  eventId: string;
+  turnIndex: number;
+  hook: "before_main_llm" | "after_main_llm";
+  opId: string;
+  createdAt: number; // epoch ms
+
+  value: ArtifactValueEnvelope;
+};
+
+type ArtifactRecord = {
+  tag: string;
+  persistence: "run_only" | "persisted";
+  semantics: string;
+
+  current: ArtifactValueEnvelope | null;
+  history: ArtifactHistoryItem[];  // ограничена history.maxItems
+};
+```
+
+---
+
+## 4. Views: Prompt / Inline UI / Panel UI
+
+### 4.1. Типы Views
+
+```ts
+type ArtifactView =
+  | PromptPartView
+  | TurnRewriteView
+  | VirtualEntryView
+  | InlineMessagePartView
+  | PanelView;
+```
+
+---
+
+## 5. Render: dumb vs smart
+
+Это универсальная схема, используемая в prompt и UI.
+
+### 5.1. RenderSpec
+
+```ts
+type HistoryWindow =
+  | { kind: "none" }
+  | { kind: "last_n"; n: number };
+
+type RenderInput =
+  | { kind: "event_value" }          // значение текущего artifact event
+  | { kind: "artifact_current" }     // текущее значение артефакта (после применения event)
+  | { kind: "artifact_feed" };       // feed = [current + historyWindow]
+
+type RenderSpec =
+  | {
+      kind: "dumb";
+      input: RenderInput;
+      historyWindow?: HistoryWindow;   // для artifact_feed
+      outputFormat: "text" | "markdown" | "json";
+    }
+  | {
+      kind: "liquid";
+      input: RenderInput;
+      historyWindow?: HistoryWindow;
+      template: string;                 // liquid-шаблон
+      outputFormat: "text" | "markdown" | "json";
+      strictVariables?: boolean;
+    }
+  | {
+      kind: "smart";
+      input: RenderInput;
+      historyWindow?: HistoryWindow;
+      rendererId: string;               // UI-only: renderer
+      props?: Record<string, unknown>;
+    };
+```
+
+### 5.2. Контекст Liquid
+
+Если `RenderSpec.kind="liquid"`, движок MUST предоставить:
+
+* `this.tag` — tag текущего артефакта
+* `this.event` — `{eventId, turnIndex, hook, opId, value}`
+* `this.value` — выбранный input (event_value/current)
+* `this.feed` — массив history items (если input=artifact_feed)
+* `art` — объект всех артефактов (текущие состояния), доступ по dot-path:
+
+  * `art.world.state.current.value`
+* `now` — ISO timestamp
+
+Для **rewrite**-view дополнительно:
+
+* `target.text` — текущий текст цели (до применения текущего rewrite шага)
+
+---
+
+## 6. Детерминированный механизм “записи по очереди”
+
+### 6.1. Порядок операций: Commit Order
+
+Для каждого hook (`before_main_llm`, `after_main_llm`) вычисляется **единственный детерминированный список операций**:
+
+1. Строим граф зависимостей `dependsOn`.
+2. Делаем topological sort.
+3. Внутри одной “прослойки” topo-sort сортируем по:
+
+   1. `config.order` по возрастанию
+   2. `opId` лексикографически (как стабильный tie-break)
+
+**Commit Order MUST быть одинаковым** при одинаковой конфигурации.
+
+### 6.2. Конкурентное выполнение vs последовательный коммит
+
+* Операции MAY выполняться конкурентно (LLM вызовы параллельно).
+* Но результаты MUST быть **применены (committed)** строго по **Commit Order**.
+* Никакие “кто раньше завершился” не влияют на финальное состояние.
+
+### 6.3. Порядок событий внутри операции
+
+Если операция эмитит несколько событий (см. 7.2), то:
+
+* они MUST применяться в порядке массива `outputs[]`.
+
+---
+
+## 7. Выход операции: только artifact.emit
+
+### 7.1. Operation output
+
+```ts
+type ArtifactWriteMode = "set" | "append";
+
+type ArtifactEmit = {
+  type: "artifact.emit";
+  tag: string;
+
+  writeMode?: ArtifactWriteMode; // default определяется semantics:
+                                // state => set, log/feed => append, остальное => set
+
+  value: ArtifactValueEnvelope;  // text/markdown/json
+};
+```
+
+### 7.2. Множественный output
+
+Операция MAY эмитить несколько артефактов:
+
+```ts
+type OperationOutput = {
+  type: "artifact.emit_many";
+  outputs: ArtifactEmit[];
+};
+```
+
+---
+
+## 8. Материализация Views: как артефакты попадают в Prompt и UI
+
+Ключевое правило:
+
+> Каждый `artifact.emit` после применения к store **триггерит materialization** всех `views` этого артефакта (в commit-порядке событий).
+
+### 8.1. Write → обновление store
+
+При применении event:
+
+* `set`: `current = value`, историю обновляем по правилам `history.enabled/maxItems`
+* `append`:
+
+  * `current = value`
+  * и в историю добавляем item как отдельное событие (даже если current перезаписался)
+
+История MUST соблюдать `maxItems` (обрезаем с начала, оставляем последние).
+
+---
+
+# 9. Prompt Views
+
+## 9.1. PromptPartView (вставка Part в prompt)
+
+Используется для “Prompt Only” и части “Prompt+UI”.
+
+```ts
+type PromptTarget =
+  | { kind: "system" }
+  | { kind: "current_user_entry" }          // entry пользователя текущего turn
+  | { kind: "assistant_output_entry" }      // entry ассистента текущего run
+  | { kind: "prompt_entry_at_depth"; role: "user"|"assistant"; depthFromEnd: number };
+
+type UpsertMode = "upsert" | "append";
+
+type PromptPartView = {
+  kind: "prompt_part";
+  id: string;                // уникально внутри артефакта
+
+  target: PromptTarget;
+  materialize: UpsertMode;
+
+  part: {
+    channel: "main" | "aux" | "trace";
+    order: number;
+
+    visibility: { ui: "never" | "debug" | "always"; prompt: true };
+
+    // lifespan влияет ТОЛЬКО на prompt-включение (UI не режем lifespan’ом)
+    promptLifespan: "infinite" | { turns: number };
+
+    // как получить payload
+    render: RenderSpec;
+
+    // как сериализовать в prompt (если payload json/markdown)
+    promptSerializer: { serializerId: string; props?: Record<string, unknown> };
+
+    // ui-рендер для inline НЕ используется здесь (это prompt view)
+    ui?: never;
+  };
+};
+```
+
+### Правила
+
+* `PromptPartView.part.visibility.prompt` MUST быть `true`.
+* `PromptPartView` MUST NOT отображаться в UI (ui visibility = never или debug допускается только если usage не prompt_only, см. 12).
+
+### Upsert semantics
+
+* `materialize="upsert"`: в target создаётся/обновляется **один** Part-слот с тегами:
+
+  * `artifact:<tag>`
+  * `view:<id>`
+* `materialize="append"`: каждый event создаёт новый Part (с доп. тегом `event:<eventId>`).
+
+---
+
+## 9.2. TurnRewriteView (каноникализация / override без отдельного эффекта)
+
+Это **прямой заменитель** Turn canonicalization effects.
+
+```ts
+type RewriteTarget =
+  | { kind: "current_user_main" }       // только в before_main_llm
+  | { kind: "assistant_output_main" };  // только в after_main_llm
+
+type TextCompose = "replace" | "prepend" | "append";
+
+type TurnRewriteView = {
+  kind: "turn_rewrite";
+  id: string;
+
+  target: RewriteTarget;
+  compose: TextCompose;
+
+  // откуда берём текст (как event_value/current/etc)
+  render: RenderSpec;
+
+  // сохранять ли результат как part в entry_parts (да, всегда для user/assistant)
+  persist: true;
+};
+```
+
+### Правила
+
+* `target.kind="current_user_main"` разрешён **только** в `before_main_llm`.
+* `target.kind="assistant_output_main"` разрешён **только** в `after_main_llm`.
+* Применение rewrite MUST быть последовательным: если несколько rewrite-view срабатывают, они применяются **в commit order**, и каждый следующий rewrite работает с `target.text`, уже изменённым предыдущими rewrite’ами.
+
+### Реализация через Parts (строгое поведение)
+
+Когда применяется rewrite:
+
+1. движок берёт **текущий эффективный main text** цели,
+2. вычисляет `newText` по `compose`,
+3. создаёт новый Part, который:
+
+   * копирует channel/order/visibility/prompt/ui базового main-part’а цели,
+   * ставит `replacesPartId` равным текущему main-partId,
+   * добавляет теги: `artifact:<tag>`, `view:<id>`, `rewrite`, `event:<eventId>`,
+4. обновляет “effective main part pointer” на этот новый part.
+
+---
+
+## 9.3. VirtualEntryView (создать новое виртуальное сообщение только для prompt)
+
+Это **заменитель** Prompt-time insertion эффектов.
+
+```ts
+type VirtualInsert =
+  | { kind: "after_last_user" }
+  | { kind: "at_depth_from_end"; depthFromEnd: number }; // как prompt.insert_at_depth
+
+type VirtualEntryView = {
+  kind: "virtual_entry";
+  id: string;
+
+  role: "system" | "user" | "assistant";
+  insert: VirtualInsert;
+
+  render: RenderSpec; // генерит содержимое виртуального сообщения
+};
+```
+
+### Правила
+
+* VirtualEntryView **не пишет в БД** и **не виден** другим view как target.
+* Виртуальное сообщение живёт только в рамках **текущего prompt build**.
+
+---
+
+# 10. UI Views
+
+## 10.1. InlineMessagePartView (Part внутри сообщения)
+
+Используется для `ui_only` и `prompt+ui` (inline отображение).
+
+```ts
+type UiTarget =
+  | { kind: "current_user_entry" }
+  | { kind: "assistant_output_entry" }
+  | { kind: "entry_at_depth"; role: "user"|"assistant"; depthFromEnd: number };
+
+type InlineMessagePartView = {
+  kind: "inline_part";
+  id: string;
+
+  target: UiTarget;
+  materialize: "upsert" | "append";
+
+  part: {
+    channel: "aux" | "trace";  // inline части НЕ являются main
+    order: number;
+
+    visibility: { ui: "always" | "debug"; prompt: boolean };
+
+    // promptLifespan влияет только на prompt (UI сохраняется)
+    promptLifespan: "infinite" | { turns: number };
+
+    render: RenderSpec;
+
+    uiRenderer: { rendererId: string; props?: Record<string, unknown> };
+    promptSerializer?: { serializerId: string; props?: Record<string, unknown> };
+  };
+};
+```
+
+### Правила
+
+* Inline part MUST быть `channel != main`.
+* Если `visibility.prompt=true`, тогда part участвует в prompt наравне с остальными частями entry (см. 11).
+
+---
+
+## 10.2. PanelView (отдельный интерфейс/панель артефакта)
+
+Это второй UI-режим (вне сообщений), с лентой.
+
+```ts
+type PanelFeed =
+  | { kind: "current_only" }
+  | { kind: "current_plus_last_n"; n: number }
+  | { kind: "history_only_last_n"; n: number };
+
+type PanelView = {
+  kind: "panel";
+  id: string;
+
+  panelId: string;       // например: "right_sidebar" | "tab:artifacts" | "custom:<id>"
+  feed: PanelFeed;
+
+  // Dumb: показываем как есть (текст/markdown/json)
+  // Smart: rendererId (пользовательская верстка/шаблон/компонент)
+  render: RenderSpec;
+};
+```
+
+### Правила
+
+* PanelView MUST получать данные только из ArtifactRecord (current+history).
+* PanelView MUST поддерживать “ленту”: текущий элемент + N предыдущих (feed).
+
+---
+
+# 11. Сборка Prompt из Parts
+
+## 11.1. Системное сообщение
+
+Prompt builder MUST формировать **ровно одно** system message.
+
+System content строится так:
+
+1. Собираем все system parts (base + materialized prompt_part/virtual_entry(role=system)).
+2. Фильтруем те, у кого `promptLifespan` активен.
+3. Сортируем по `order`.
+4. Конкатенируем через разделитель `\n\n`.
+
+## 11.2. User/Assistant сообщения
+
+Для каждого entry:
+
+1. берём active variant,
+2. берём parts:
+
+   * `softDeleted != true`
+   * `visibility.prompt == true`
+   * `promptLifespan` активен
+3. сортируем по `order`,
+4. сериализуем каждый part `promptSerializer`,
+5. склеиваем (по правилам сериализатора/канала; default: `\n\n`).
+
+---
+
+# 12. Валидация (жесткие ошибки)
+
+## 12.1. usage ↔ views
+
+`ArtifactDefinition.usage` MUST соответствовать наличию views:
+
+* `prompt_only`:
+
+  * MUST иметь ≥ 1 view типа `prompt_part`/`turn_rewrite`/`virtual_entry`
+  * MUST NOT иметь `inline_part` и `panel`
+
+* `ui_only`:
+
+  * MUST иметь ≥ 1 view типа `inline_part` и/или `panel`
+  * MUST NOT иметь prompt-only views
+
+* `prompt+ui`:
+
+  * MUST иметь ≥ 1 prompt-view
+  * MUST иметь ≥ 1 ui-view
+
+* `internal`:
+
+  * MUST NOT иметь views вообще
+
+## 12.2. Запрещенные комбинации
+
+* `TurnRewriteView.target=current_user_main` в `after_main_llm` → ERROR
+* `TurnRewriteView.target=assistant_output_main` в `before_main_llm` → ERROR
+* `InlineMessagePartView.part.channel="main"` → ERROR
+* `tag` не соответствует формату → ERROR
+
+---
+
+# 13. Примеры (минимально необходимые)
+
+## 13.1. “World State” как system instruction (Prompt Only)
+
+* артефакт хранит markdown
+* в prompt вставляется как system part с order=10
+* UI нет
+
+```json
+{
+  "tag": "world.state",
+  "title": "World State",
+  "usage": "prompt_only",
+  "persistence": "persisted",
+  "semantics": "state",
+  "valueFormat": "markdown",
+  "history": { "enabled": true, "maxItems": 50 },
+  "views": [
+    {
+      "kind": "prompt_part",
+      "id": "sys_instruction",
+      "target": { "kind": "system" },
+      "materialize": "upsert",
+      "part": {
+        "channel": "aux",
+        "order": 10,
+        "visibility": { "ui": "never", "prompt": true },
+        "promptLifespan": "infinite",
+        "render": { "kind": "dumb", "input": { "kind": "artifact_current" }, "outputFormat": "markdown" },
+        "promptSerializer": { "serializerId": "core.markdown_to_text" }
+      }
+    }
+  ]
+}
+```
+
+## 13.2. Каноникализация user turn (Turn rewrite)
+
+```json
+{
+  "tag": "turn.user.canonical",
+  "title": "Canonical User Turn",
+  "usage": "prompt+ui",
+  "persistence": "persisted",
+  "semantics": "intermediate",
+  "valueFormat": "text",
+  "history": { "enabled": true, "maxItems": 20 },
+  "views": [
+    {
+      "kind": "turn_rewrite",
+      "id": "rewrite_user",
+      "target": { "kind": "current_user_main" },
+      "compose": "replace",
+      "render": { "kind": "dumb", "input": { "kind": "event_value" }, "outputFormat": "text" },
+      "persist": true
+    }
+  ]
+}
+```
+
+## 13.3. “Погода” — в prompt только текущая, в UI панель лента
+
+* prompt: только текущий turn (TTL=1)
+* panel: last 20
+
+```json
+{
+  "tag": "world.weather",
+  "title": "Weather",
+  "usage": "prompt+ui",
+  "persistence": "persisted",
+  "semantics": "log/feed",
+  "valueFormat": "json",
+  "schemaId": "weather.v1",
+  "history": { "enabled": true, "maxItems": 200 },
+  "views": [
+    {
+      "kind": "prompt_part",
+      "id": "weather_prompt",
+      "target": { "kind": "system" },
+      "materialize": "upsert",
+      "part": {
+        "channel": "aux",
+        "order": 30,
+        "visibility": { "ui": "never", "prompt": true },
+        "promptLifespan": { "turns": 1 },
+        "render": {
+          "kind": "liquid",
+          "input": { "kind": "artifact_current" },
+          "template": "Weather now: {{ this.value.value.temperature }}C, {{ this.value.value.summary }}",
+          "outputFormat": "text"
+        },
+        "promptSerializer": { "serializerId": "core.text" }
+      }
+    },
+    {
+      "kind": "panel",
+      "id": "weather_panel",
+      "panelId": "right_sidebar",
+      "feed": { "kind": "current_plus_last_n", "n": 20 },
+      "render": {
+        "kind": "smart",
+        "input": { "kind": "artifact_feed" },
+        "historyWindow": { "kind": "last_n", "n": 20 },
+        "rendererId": "core.weather_timeline",
+        "props": { "showIcons": true }
+      }
+    }
+  ]
+}
+```
+
+---
+
+# 14. Что именно нужно поменять в текущем проекте (строго по контракту)
+
+Это НЕ “варианты”, а прямой список обязательных изменений для соответствия спеки:
+
+1. `OperationOutput`:
+
+   * удалить `prompt_time` и `turn_canonicalization`
+   * оставить только `artifact.emit` / `artifact.emit_many`
+
+2. Runtime commit:
+
+   * собирать результаты операций как сейчас можно,
+   * но **применять строго по Commit Order** (граф dependsOn → order → opId),
+   * каждый emit → update store → materialize views.
+
+3. Prompt builder:
+
+   * гарантировать **один system message**
+   * собирать system из parts
+
+4. Canonicalization:
+
+   * реализовать через `TurnRewriteView` (создание part с replacesPartId по “текущему эффективному main”)
+
+5. UI:
+
+   * inline — через parts
+   * panel — через artifact records + panel view (feed).
+
diff --git a/knowledge-base/artifacts-v1-migration-plan-2026-02-21.md b/knowledge-base/artifacts-v1-migration-plan-2026-02-21.md
new file mode 100644
index 00000000..49e4677b
--- /dev/null
+++ b/knowledge-base/artifacts-v1-migration-plan-2026-02-21.md
@@ -0,0 +1,238 @@
+# Artifacts v1.0 — Migration Plan (2026-02-21)
+
+## 1. Цель
+
+Перевести текущую систему операций на контракт из `knowledge-base/Artifacts v1.0.md` без big-bang переписывания:
+
+1. единый output: только `artifact.emit` / `artifact.emit_many`;
+2. детерминированный commit и materialization через views;
+3. canonicalization через `TurnRewriteView`;
+4. единая prompt-сборка с ровно одним `system` сообщением;
+5. поддержка UI-view (`inline_part`, `panel`) из artifact store.
+
+## 2. Ключевые разрывы (что закрываем)
+
+1. В коде живут legacy-выходы `prompt_time` и `turn_canonicalization`.
+2. `turn.assistant.replace_text` не персистится в entry parts после after-фазы.
+3. Artifact value/history не поддерживает envelope/event-метаданные и writeMode.
+4. Формат tag не совместим со spec dot-path.
+5. Нет view-движка materialization (`prompt_part`, `turn_rewrite`, `virtual_entry`, `inline_part`, `panel`).
+6. Prompt runtime допускает несколько `system` сообщений.
+7. Уникальность artifact tag валидируется только внутри блока, не во всем профиле.
+
+## 3. План по этапам (PR-by-PR)
+
+## PR1 — Контракты v1.0 (без включения в runtime)
+
+Изменения:
+
+1. Ввести новые типы в `shared/types/operation-profiles.ts`:
+   - `ArtifactDefinition`, `ArtifactView`, `RenderSpec`, `ArtifactEmit`, `OperationOutputV1`.
+2. В `server/src/services/chat-generation-v3/contracts.ts` добавить runtime-типы:
+   - `artifact.emit`, `artifact.emit_many`, `ArtifactValueEnvelope`, `ArtifactHistoryItem`.
+3. Оставить legacy-типы временно как deprecated (для чтения старых профилей).
+
+Критерий готовности:
+
+1. Типы компилируются.
+2. Нет breaking API для чтения старых профилей.
+
+Проверки:
+
+1. `yarn typecheck:server`
+2. `yarn typecheck:web`
+
+## PR2 — Валидация профиля и tags
+
+Изменения:
+
+1. В `server/src/services/operations/operation-block-validator.ts`:
+   - ввести dot-path валидацию tag;
+   - добавить profile-level проверку уникальности writer tag (между всеми блоками профиля).
+2. Запретить создание новых `prompt_time`/`turn_canonicalization` в API.
+3. Оставить импорт legacy c явной нормализацией в новый контракт.
+
+Критерий готовности:
+
+1. Новые профили сохраняются только с artifacts output.
+2. Дубликат tag между блоками не проходит.
+
+Проверки:
+
+1. `yarn typecheck:server`
+2. `yarn --cwd server test -- operation-block-validator`
+
+## PR3 — Artifact commit engine (ядро)
+
+Изменения:
+
+1. В `server/src/services/chat-generation-v3/operations/execute-operations-phase.ts`:
+   - операции возвращают только `artifact.emit(_many)`.
+2. В `server/src/services/chat-generation-v3/operations/commit-effects-phase.ts`:
+   - commit только через artifact events;
+   - порядок: dependsOn topo -> order -> opId;
+   - каждый emit: `store update -> materialization`.
+3. Удалить применение `prompt.*` и `turn.*` эффектов напрямую.
+
+Критерий готовности:
+
+1. Commit детерминирован и не зависит от фактического времени завершения операций.
+2. Legacy prompt/turn эффекты не используются в runtime.
+
+Проверки:
+
+1. `yarn typecheck:server`
+2. `yarn --cwd server test -- commit-effects-phase`
+3. `yarn --cwd server test -- execute-operations-phase`
+
+## PR4 — Artifact store v1.0 data model
+
+Изменения:
+
+1. Обновить `RunArtifactStore` и `ProfileSessionArtifactStore`:
+   - `current: ArtifactValueEnvelope | null`;
+   - `history: ArtifactHistoryItem[]`;
+   - поддержка `writeMode: set|append`;
+   - `history.maxItems` на уровне definition.
+2. Поддержать `format: text|markdown|json`.
+3. Сохранить `schemaId` в envelope для json.
+
+Критерий готовности:
+
+1. Store хранит canonical envelope/history в формате спецификации.
+2. `append` и `set` работают по правилам spec.
+
+Проверки:
+
+1. `yarn typecheck:server`
+2. `yarn --cwd server test -- artifact-effects`
+3. `yarn --cwd server test -- commit-effects-phase`
+
+## PR5 — Materialization engine (Prompt + Rewrite + Virtual + UI)
+
+Изменения:
+
+1. Добавить модуль materializer в `server/src/services/chat-generation-v3/operations/`:
+   - `prompt_part`
+   - `turn_rewrite`
+   - `virtual_entry`
+   - `inline_part`
+   - `panel`
+2. `turn_rewrite` реализовать через новый part с `replacesPartId` от текущего effective main part.
+3. Исправить текущий баг с assistant canonicalization: rewrite assistant должен персиститься в part.
+
+Критерий готовности:
+
+1. Любой artifact emit может материализовать prompt/UI по views.
+2. User/assistant rewrite последовательно применяются в commit order.
+
+Проверки:
+
+1. `yarn typecheck:server`
+2. `yarn --cwd server test -- operations-flow.integration`
+3. Добавить новые integration tests на rewrite chain и virtual entries.
+
+## PR6 — Prompt builder: ровно одно system message
+
+Изменения:
+
+1. Перенести prompt-сборку на parts-подход из spec:
+   - единый system content = concat system parts;
+   - promptLifespan фильтрация;
+   - deterministic sort by order.
+2. Убрать множественные system-сообщения из runtime.
+
+Критерий готовности:
+
+1. На финальном `llmMessages` всегда один `system`.
+2. Prompt snapshot соответствует новому builder.
+
+Проверки:
+
+1. `yarn typecheck:server`
+2. `yarn --cwd server test -- build-base-prompt`
+3. `yarn --cwd server test -- run-chat-generation-v3`
+
+## PR7 — Web editor migration (только новый output/view)
+
+Изменения:
+
+1. В `web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx`:
+   - удалить UI выбора `prompt_time`/`turn_canonicalization`;
+   - добавить конфиг emit/views (минимально: artifact + view presets).
+2. Обновить маппинг формы и i18n (`web/src/features/.../operation-profile-form-mapping.ts`, `web/src/i18n/resources/*/operationProfiles.ts`).
+
+Критерий готовности:
+
+1. UI не дает создать legacy output.
+2. RU/EN ключи синхронизированы.
+
+Проверки:
+
+1. `yarn typecheck:web`
+2. `yarn build:web`
+
+## PR8 — Совместимость и миграция данных
+
+Изменения:
+
+1. Legacy profile reader:
+   - `prompt_time` -> `artifact.emit + virtual_entry/prompt_part`;
+   - `turn_canonicalization` -> `artifact.emit + turn_rewrite`.
+2. Скрипт миграции профилей/блоков (dry-run + apply).
+3. Логировать авто-конверсии и ошибки несовместимых кейсов.
+
+Критерий готовности:
+
+1. Старые профили исполняются через новый runtime.
+2. Есть безопасный rollback-путь.
+
+Проверки:
+
+1. `yarn typecheck:server`
+2. `yarn --cwd server test`
+3. Smoke e2e на старом и новом профиле.
+
+## PR9 — Наблюдаемость и финальная зачистка
+
+Изменения:
+
+1. Удалить legacy effect коды из debug и runtime (`prompt.*`, `turn.*`).
+2. Обновить debug payload/events под artifact materialization.
+3. Обновить документацию `knowledge-base` и API docs.
+
+Критерий готовности:
+
+1. В коде нет runtime-зависимости от legacy effect types.
+2. Доки соответствуют фактическому поведению.
+
+Проверки:
+
+1. `yarn typecheck:server`
+2. `yarn typecheck:web`
+3. `yarn --cwd server test`
+4. `yarn docs:check` (если обновлялись docs в `docs/**`)
+
+## 4. Порядок внедрения и риски
+
+Рекомендуемый порядок: `PR1 -> PR2 -> PR3 -> PR4 -> PR5 -> PR6 -> PR7 -> PR8 -> PR9`.
+
+Основные риски:
+
+1. Несовместимость старых профилей при жестком отключении legacy-типов.
+2. Регрессии prompt-сборки из-за перехода на parts-only.
+3. Рост сложности тестов и необходимость новых integration fixtures.
+
+Снижение рисков:
+
+1. Feature flag на новый commit/materialize engine.
+2. Параллельный dual-read для legacy профилей до завершения PR8.
+3. Golden tests на prompt hash/snapshot до и после миграции.
+
+## 5. Definition of Done (общая)
+
+1. Runtime использует только artifact emit контракт.
+2. Turn canonicalization полностью реализована через `TurnRewriteView`.
+3. Prompt builder выдает один system message.
+4. UI поддерживает только новый способ настройки output/views.
+5. Все обязательные проверки сервера и веба проходят.

From 9ed5fa9e8112d5fa78d85265ce7f38f45b7e5e6b Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 7 Mar 2026 18:34:25 +0300
Subject: [PATCH 02/54] fix: up

---
 .../artifacts-concept-v2-draft-2026-03-07.md  | 536 ++++++++++++++++++
 1 file changed, 536 insertions(+)
 create mode 100644 knowledge-base/artifacts-concept-v2-draft-2026-03-07.md

diff --git a/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md b/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md
new file mode 100644
index 00000000..016905da
--- /dev/null
+++ b/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md
@@ -0,0 +1,536 @@
+# Operations as Artifacts — Concept Draft v2
+
+## 0. Зачем это нужно
+
+Сейчас у операций есть несколько типов эффектов:
+
+- `artifacts`
+- `prompt_time`
+- `turn_canonicalization`
+
+Концептуально они решают очень похожую задачу: результат работы операции должен где-то сохраниться и затем как-то повлиять на prompt, UI или текущий turn.
+
+Для конечного пользователя это выглядит как три разных механизма, которые частично пересекаются по смыслу. В итоге модель становится сложнее, чем сама задача.
+
+Цель нового дизайна:
+
+> любая операция по умолчанию производит артефакт со своим состоянием, а уже сам артефакт определяет, взаимодействует ли он с внешним миром и каким образом.
+
+
+## 1. Главная идея
+
+Новая модель строится вокруг трех сущностей:
+
+1. `Operation`
+   Вычисляет результат.
+
+2. `Artifact`
+   Хранит результат операции как состояние.
+
+3. `Artifact Exposure`
+   Определяет, как состояние артефакта влияет на внешний мир:
+   - prompt
+   - UI
+   - rewrite текущего turn
+
+Формула системы:
+
+`operation produces state -> artifact stores state -> exposures apply state`
+
+Это означает:
+
+- операция не пишет напрямую в prompt
+- операция не переписывает напрямую сообщения
+- операция не создает напрямую UI-эффекты
+- операция только обновляет состояние своего артефакта
+- все внешнее поведение описывается через exposures артефакта
+
+
+## 2. Принципы
+
+### 2.1. Операция всегда пишет в артефакт
+
+У каждой операции есть один основной артефакт.
+
+Это базовый и обязательный контракт.
+
+Операция не должна выбирать между разными output-механиками. Она всегда делает одно и то же:
+
+1. выполняется
+2. получает результат
+3. записывает результат в свой артефакт
+
+
+### 2.2. Хранение данных и их публикация разделены
+
+Нужно явно различать:
+
+- что хранится
+- как долго хранится
+- как это показывается в prompt
+- как это показывается в UI
+- влияет ли это на rewrite turn
+
+Это разные оси поведения. Их нельзя смешивать в один флаг вроде `usage`.
+
+
+### 2.3. Артефакт может быть полностью внутренним
+
+Артефакт не обязан никак отображаться наружу.
+
+Если у него нет exposures, он остается внутренним состоянием, доступным только другим операциям и шаблонам.
+
+
+### 2.4. Rewrite turn — это не отдельный output операции
+
+Переписывание user/assistant turn остается допустимым поведением, но описывается не как отдельный вид output операции, а как один из видов exposure артефакта.
+
+То есть:
+
+- операция вычисляет канонизированный текст
+- артефакт хранит этот текст
+- exposure `turn_rewrite` применяет его к целевой части turn
+
+
+### 2.5. Система должна быть детерминированной
+
+При одинаковой конфигурации и одинаковых входных данных результат должен быть одинаковым:
+
+- одинаковый artifact state
+- одинаковый prompt
+- одинаковый UI/resulting rewrite
+
+
+## 3. Что не является целью первой версии
+
+Этот концепт сознательно не пытается сразу решить все будущие задачи.
+
+Не цель v1:
+
+- сложный universal DSL на все случаи жизни
+- multi-writer artifacts
+- fan-out одной операции в много артефактов
+- отдельный мощный panel framework
+- продвинутая система renderer marketplace
+- попытка закрыть все будущие сценарии одним документом
+
+Сначала нужна простая, понятная и устойчивая модель.
+
+
+## 4. Термины
+
+### Operation
+
+Конфигурируемая единица вычисления, которая запускается на определенном hook и производит новое состояние своего артефакта.
+
+
+### Artifact
+
+Состояние, связанное с одной операцией.
+
+Артефакт:
+
+- имеет `tag`
+- хранит текущее значение
+- опционально хранит историю
+- может иметь exposures
+
+
+### Exposure
+
+Правило публикации состояния артефакта во внешний мир.
+
+Exposure не меняет смысл самого артефакта. Exposure только определяет, как это состояние используется.
+
+
+### Artifact State
+
+Текущее значение артефакта после последнего успешного применения операции.
+
+
+### Artifact History
+
+История прошлых значений артефакта.
+
+Это именно история состояния артефакта, а не история его отображения в prompt или UI.
+
+
+## 5. Базовые инварианты
+
+### 5.1. Один operation -> один primary artifact
+
+В базовой версии каждая операция имеет ровно один основной артефакт.
+
+Это сознательное ограничение ради простоты модели.
+
+
+### 5.2. Operation не имеет prompt/ui output типов
+
+У операции нет отдельных output-типов вроде:
+
+- `prompt_time`
+- `turn_canonicalization`
+
+Операция имеет только artifact output.
+
+
+### 5.3. Внешний эффект возможен только через exposures
+
+Если состояние артефакта должно попасть:
+
+- в prompt
+- в UI
+- в rewrite текущего turn
+
+это всегда задается через exposure.
+
+
+### 5.4. Persistence принадлежит артефакту
+
+`run_only` или `persisted` — это свойство самого артефакта.
+
+Не exposure.
+
+
+### 5.5. Lifetime включения в prompt/UI принадлежит exposure
+
+Сколько проекция живет в prompt или где именно она отображается — это свойство exposure.
+
+Не artifact history.
+
+
+### 5.6. История артефакта и prompt lifetime — разные вещи
+
+Нельзя смешивать:
+
+- "хранить прошлые значения"
+- "показывать значение в prompt только 3 хода"
+
+Первое относится к artifact state/history.
+Второе относится к exposure.
+
+
+## 6. Предлагаемая модель данных
+
+Ниже логическая модель, не обязательная как точный runtime shape.
+
+```ts
+type ArtifactFormat = "text" | "markdown" | "json";
+type ArtifactPersistence = "run_only" | "persisted";
+type ArtifactWriteMode = "replace" | "append";
+
+type OperationArtifactConfig = {
+  tag: string;
+  title: string;
+  description?: string;
+
+  format: ArtifactFormat;
+  persistence: ArtifactPersistence;
+  writeMode: ArtifactWriteMode;
+
+  history: {
+    enabled: boolean;
+    maxItems: number;
+  };
+
+  exposures: ArtifactExposure[];
+};
+```
+
+```ts
+type ArtifactRecord = {
+  tag: string;
+  format: "text" | "markdown" | "json";
+  persistence: "run_only" | "persisted";
+
+  current: unknown | null;
+  history: ArtifactHistoryItem[];
+};
+
+type ArtifactHistoryItem = {
+  turnIndex: number;
+  hook: "before_main_llm" | "after_main_llm";
+  opId: string;
+  createdAt: number;
+  value: unknown;
+};
+```
+
+
+## 7. Exposure-модель
+
+Exposure описывает только использование состояния артефакта.
+
+### 7.1. Prompt Part Exposure
+
+Вставляет состояние артефакта как part в существующее сообщение или system area.
+
+Примеры:
+
+- world state в system
+- временный weather block
+- скрытый aux block для модели
+
+
+### 7.2. Prompt Message Exposure
+
+Создает отдельное виртуальное сообщение для prompt.
+
+Это замена сценариев, где раньше был prompt-time insertion как отдельный эффект.
+
+Важно:
+
+- это prompt-only проекция
+- она не обязана становиться частью persisted entry parts
+
+
+### 7.3. Turn Rewrite Exposure
+
+Применяет состояние артефакта как rewrite к:
+
+- текущему user main
+- assistant output main
+
+Это замена отдельного canonicalization output.
+
+Семантически это не "prompt insertion", а именно "mutation through artifact state".
+
+
+### 7.4. UI Inline Exposure
+
+Показывает состояние артефакта как inline part внутри сообщения.
+
+
+### 7.5. UI Panel Exposure
+
+Показывает состояние артефакта вне сообщений, в отдельной панели или секции интерфейса.
+
+Это полезный режим, но он не должен усложнять первую рабочую версию.
+
+
+## 8. Минимальный набор exposure-типов для первой версии
+
+Для первой реальной версии достаточно поддержать:
+
+1. `prompt_part`
+2. `prompt_message`
+3. `turn_rewrite`
+4. `ui_inline`
+
+`ui_panel` можно оставить как future-ready extension, но не делать обязательным центром дизайна.
+
+
+## 9. Как должна работать операция
+
+### 9.1. Execution contract
+
+Операция на выходе должна вернуть новое значение для своего артефакта.
+
+Примерно так:
+
+```ts
+type OperationResult = {
+  artifact: {
+    value: unknown;
+  };
+};
+```
+
+В расширенной версии можно добавить:
+
+- `format`
+- `schemaId`
+- `debugMeta`
+
+Но это не меняет главную идею: операция возвращает новое состояние артефакта, а не набор разнотипных эффектов.
+
+
+### 9.2. Commit contract
+
+При commit:
+
+1. определяется детерминированный порядок операций
+2. состояние артефакта обновляется
+3. после обновления состояния применяются exposures этого артефакта
+
+
+## 10. Запись состояния артефакта
+
+### 10.1. Replace mode
+
+`replace` означает:
+
+- `current` заменяется новым значением
+- history при необходимости пополняется новым snapshot
+
+
+### 10.2. Append mode
+
+`append` нужен для feed/log-подобных сценариев.
+
+Он означает, что новое значение логически добавляется как новый элемент истории, а `current` отражает последнее состояние.
+
+Это полезно для:
+
+- погоды
+- событий
+- журналов
+- изменений по персонажу
+
+
+## 11. Что принадлежит artifact, а что exposure
+
+### Artifact-level
+
+- `tag`
+- `format`
+- `persistence`
+- `writeMode`
+- `history.enabled`
+- `history.maxItems`
+
+
+### Exposure-level
+
+- target
+- способ вставки/переписывания
+- prompt/UI visibility
+- order
+- serializer/renderer
+- lifetime участия в prompt
+
+
+Это ключевое разделение модели.
+
+
+## 12. Отношение к существующей parts-модели проекта
+
+В проекте уже существует сильная модель `entry parts`.
+
+Это хорошо.
+
+Новый концепт не должен дублировать parts как отдельную параллельную сущность. Наоборот:
+
+- artifacts отвечают за данные и состояние
+- parts остаются основным substrate для prompt/UI materialization там, где это уместно
+
+Следствие:
+
+- `prompt_part`
+- `ui_inline`
+- `turn_rewrite`
+
+должны по возможности опираться на уже существующую parts-модель, а не создавать вторую независимую систему.
+
+
+## 13. Что должно исчезнуть из пользовательской модели
+
+Пользователь не должен думать в терминах:
+
+- "моя операция делает artifacts"
+- "моя операция делает prompt_time"
+- "моя операция делает canonicalization"
+
+Пользователь должен думать так:
+
+1. операция вычисляет состояние
+2. это состояние хранится в артефакте
+3. артефакт публикует себя через exposures
+
+
+## 14. Примеры
+
+### 14.1. World State
+
+Операция обновляет `world.state`.
+
+Артефакт:
+
+- `persistence = persisted`
+- `format = markdown`
+
+Exposure:
+
+- `prompt_part` в system
+
+UI exposure не нужен.
+
+
+### 14.2. Weather Tracker
+
+Операция обновляет `world.weather`.
+
+Артефакт:
+
+- `persistence = persisted`
+- `writeMode = append`
+- хранит историю значений
+
+Exposures:
+
+- `prompt_part` только на короткий prompt lifetime
+- позже можно добавить `ui_panel`
+
+
+### 14.3. User Turn Canonicalizer
+
+Операция вычисляет канонизированную версию user message.
+
+Артефакт:
+
+- хранит результат нормализации как state
+
+Exposure:
+
+- `turn_rewrite(target = current_user_main, mode = replace)`
+
+Это тот же артефакт, а не отдельный special effect type.
+
+
+### 14.4. Internal Stat Tracker
+
+Операция считает внутренний показатель.
+
+Артефакт:
+
+- persisted или run_only
+- без exposures
+
+Он никак не виден пользователю, но доступен другим операциям.
+
+
+## 15. Осознанные ограничения первой версии
+
+Чтобы система осталась понятной, первая версия должна быть ограниченной:
+
+- одна операция -> один primary artifact
+- без multi-emit
+- без shared writers
+- без сложной inheritance-модели артефактов
+- без обязательной panel-системы
+
+Если позже эти ограничения станут мешать, их можно расширить отдельной версией концепта.
+
+
+## 16. Итоговый тезис
+
+Новая модель должна быть не "еще одной сложной универсальной системой эффектов", а нормализацией уже существующей идеи:
+
+- операция всегда производит состояние
+- это состояние всегда живет в артефакте
+- все взаимодействие с внешним миром описывается только через exposures артефакта
+
+Именно это и должно стать основой новой системы операций.
+
+
+## 17. Вопросы на следующее обсуждение
+
+После принятия этого концепта отдельно нужно решить:
+
+1. Должен ли `tag` быть глобально уникален в profile или вычисляться автоматически из operation id.
+2. Нужен ли пользователю editable `tag`, или лучше иметь стабильный internal id и отдельный display name.
+3. Должен ли `turn_rewrite` всегда персиститься в parts.
+4. Нужен ли `append` как write mode в первой версии, или пока достаточно только `replace`.
+5. Нужен ли `ui_panel` уже в первой версии, или его лучше отложить.
+6. Насколько exposure-конфиг должен быть low-level, а насколько через пресеты.
+

From 4551ee158ec740fe3ce02780d1b88e36f3189d44 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sun, 8 Mar 2026 21:49:54 +0300
Subject: [PATCH 03/54] fix: liquidjs templates

---
 .../prompt-template-renderer.test.ts          |  84 ++++++
 .../chat-core/prompt-template-renderer.ts     | 208 +++++++++++---
 web/src/i18n/resources/en/dialogs.ts          |  19 ++
 web/src/i18n/resources/ru/dialogs.ts          |  19 ++
 web/src/ui/liquid-template-docs-config.ts     |  43 +++
 web/src/ui/liquid-template-docs.tsx           | 263 ++++++++++++------
 6 files changed, 522 insertions(+), 114 deletions(-)

diff --git a/server/src/services/chat-core/prompt-template-renderer.test.ts b/server/src/services/chat-core/prompt-template-renderer.test.ts
index 150244d3..039c7c51 100644
--- a/server/src/services/chat-core/prompt-template-renderer.test.ts
+++ b/server/src/services/chat-core/prompt-template-renderer.test.ts
@@ -22,6 +22,7 @@ describe("prompt-template-renderer", () => {
     expect(() => validateLiquidTemplate("Hello {{ user.name }}")).not.toThrow();
     expect(() => validateLiquidTemplate("{{outlet::default}}")).not.toThrow();
     expect(() => validateLiquidTemplate("{{random::A::B}}")).not.toThrow();
+    expect(() => validateLiquidTemplate("{{ recentMessages(2) | size }}")).not.toThrow();
     expect(() => validateLiquidTemplate("{{ broken ")).toThrow();
   });
 
@@ -164,4 +165,87 @@ describe("prompt-template-renderer", () => {
 
     expect(rendered).toBe("Bad={{random::   }}");
   });
+
+  test("renders recentMessages(count) after preprocessing and keeps chronological order", async () => {
+    const rendered = await renderLiquidTemplate({
+      templateText:
+        "{% assign msgs = recentMessages(3) %}{% for m in msgs %}[{{m.role}}={{m.content}}]{% endfor %}",
+      context: {
+        ...makeContext(),
+        messages: [
+          { role: "system", content: "S0" },
+          { role: "assistant", content: "A1" },
+          { role: "user", content: "U1" },
+          { role: "assistant", content: "A2" },
+          { role: "user", content: "U2" },
+        ],
+      },
+    });
+
+    expect(rendered).toBe("[user=U1][assistant=A2][user=U2]");
+  });
+
+  test("recentMessagesText(count) formats conversational messages as role-prefixed lines", async () => {
+    const rendered = await renderLiquidTemplate({
+      templateText: "{{ recentMessagesText(2) }}",
+      context: {
+        ...makeContext(),
+        messages: [
+          { role: "assistant", content: "A1" },
+          { role: "system", content: "S0" },
+          { role: "user", content: "U1" },
+          { role: "assistant", content: "A2" },
+        ],
+      },
+    });
+
+    expect(rendered).toBe("user: U1\nassistant: A2");
+  });
+
+  test("recentMessagesByContextTokens(tokenLimit) uses chars-per-4 heuristic and rounds upward", async () => {
+    const rendered = await renderLiquidTemplate({
+      templateText:
+        "{% assign msgs = recentMessagesByContextTokens(4) %}{% for m in msgs %}[{{m.role}}={{m.content}}]{% endfor %}",
+      context: {
+        ...makeContext(),
+        messages: [
+          { role: "user", content: "12345678" },
+          { role: "assistant", content: "123456789012" },
+          { role: "user", content: "1234" },
+        ],
+      },
+    });
+
+    expect(rendered).toBe("[assistant=123456789012][user=1234]");
+  });
+
+  test("recentMessagesByContextTokensText(tokenLimit) includes the overflowing message and excludes system", async () => {
+    const rendered = await renderLiquidTemplate({
+      templateText: "{{ recentMessagesByContextTokensText(3) }}",
+      context: {
+        ...makeContext(),
+        messages: [
+          { role: "user", content: "12345678901234567890" },
+          { role: "system", content: "ignored" },
+          { role: "assistant", content: "12345678" },
+          { role: "user", content: "1234" },
+        ],
+      },
+    });
+
+    expect(rendered).toBe("assistant: 12345678\nuser: 1234");
+  });
+
+  test("recent message helpers return empty values for invalid or non-positive args", async () => {
+    const rendered = await renderLiquidTemplate({
+      templateText:
+        "A={{ recentMessages(0) | size }}|B={{ recentMessagesText(-1) }}|C={{ recentMessagesByContextTokens() | size }}|D={{ recentMessagesByContextTokensText('bad') }}",
+      context: {
+        ...makeContext(),
+        messages: [{ role: "user", content: "U1" }],
+      },
+    });
+
+    expect(rendered).toBe("A=0|B=|C=0|D=");
+  });
 });
diff --git a/server/src/services/chat-core/prompt-template-renderer.ts b/server/src/services/chat-core/prompt-template-renderer.ts
index 76c0385e..2e5c35a1 100644
--- a/server/src/services/chat-core/prompt-template-renderer.ts
+++ b/server/src/services/chat-core/prompt-template-renderer.ts
@@ -37,17 +37,139 @@ export interface InstructionRenderContext {
   lastAssistantMessage?: string;
 }
 
-const engine = new Liquid({
-  cache: true,
-  strictFilters: false,
-  strictVariables: false,
-});
+type RenderableMessage = { role: string; content: string };
+
+const INTERNAL_MESSAGE_HELPER_FILTER = "__tsMessageHelper";
+const RECENT_MESSAGE_HELPER_RE =
+  /\b(recentMessages(?:Text|ByContextTokens(?:Text)?)?)\s*\(\s*([^()]*)\s*\)/g;
+const LIQUID_SEGMENT_RE = /({{[\s\S]*?}}|{%[\s\S]*?%})/g;
 
 const DEFAULT_MAX_PASSES = 5;
 const DEFAULT_MAX_OUTPUT_CHARS = 200_000;
 const TRIM_SENTINEL = "__TS_LIQUID_TRIM_SENTINEL__";
 const MACRO_TAG_RE = /{{\s*([^{}]*?)\s*}}/g;
 
+function sanitizeRenderableMessages(messages: unknown): RenderableMessage[] {
+  return Array.isArray(messages)
+    ? messages.filter(
+        (item): item is RenderableMessage =>
+          typeof item?.role === "string" && typeof item?.content === "string"
+      )
+    : [];
+}
+
+function isConversationRole(role: string): role is "user" | "assistant" {
+  return role === "user" || role === "assistant";
+}
+
+function getConversationalMessages(messages: RenderableMessage[]): RenderableMessage[] {
+  return messages.filter((message) => isConversationRole(message.role));
+}
+
+function approxTokensByChars(chars: number): number {
+  if (!Number.isFinite(chars)) return 0;
+  const normalized = Math.max(0, Math.floor(chars));
+  if (normalized === 0) return 0;
+  return Math.ceil(normalized / 4);
+}
+
+function normalizePositiveIntegerArg(value: unknown): number | null {
+  const raw =
+    typeof value === "string" && value.trim().length > 0 ? Number(value.trim()) : value;
+  if (typeof raw !== "number" || !Number.isFinite(raw)) return null;
+  const normalized = Math.floor(raw);
+  return normalized > 0 ? normalized : null;
+}
+
+function formatMessagesAsText(messages: RenderableMessage[]): string {
+  return messages.map((message) => `${message.role}: ${message.content}`).join("\n");
+}
+
+function selectRecentMessages(
+  messages: RenderableMessage[],
+  count: number
+): RenderableMessage[] {
+  if (count <= 0) return [];
+  return messages.slice(-count);
+}
+
+function selectRecentMessagesByTokenLimit(
+  messages: RenderableMessage[],
+  tokenLimit: number
+): RenderableMessage[] {
+  if (tokenLimit <= 0) return [];
+  const selected: RenderableMessage[] = [];
+  let accumulatedTokens = 0;
+
+  for (let idx = messages.length - 1; idx >= 0; idx -= 1) {
+    const message = messages[idx];
+    if (!message) continue;
+    selected.push(message);
+    accumulatedTokens += approxTokensByChars(message.content.length);
+    if (accumulatedTokens >= tokenLimit) break;
+  }
+
+  selected.reverse();
+  return selected;
+}
+
+function resolveRecentMessagesHelper(
+  helperName: unknown,
+  rawArg: unknown,
+  messages: RenderableMessage[]
+): RenderableMessage[] | string {
+  const normalizedHelperName = typeof helperName === "string" ? helperName.trim() : "";
+  const normalizedArg = normalizePositiveIntegerArg(rawArg);
+  const emptyArrayResult: RenderableMessage[] = [];
+  const emptyTextResult = "";
+  const shouldReturnText = normalizedHelperName.endsWith("Text");
+  if (!normalizedArg) {
+    return shouldReturnText ? emptyTextResult : emptyArrayResult;
+  }
+
+  const conversationalMessages = getConversationalMessages(messages);
+  const selectedMessages =
+    normalizedHelperName === "recentMessages"
+      ? selectRecentMessages(conversationalMessages, normalizedArg)
+      : normalizedHelperName === "recentMessagesText"
+        ? selectRecentMessages(conversationalMessages, normalizedArg)
+        : normalizedHelperName === "recentMessagesByContextTokens"
+          ? selectRecentMessagesByTokenLimit(conversationalMessages, normalizedArg)
+          : normalizedHelperName === "recentMessagesByContextTokensText"
+            ? selectRecentMessagesByTokenLimit(conversationalMessages, normalizedArg)
+            : null;
+
+  if (!selectedMessages) {
+    return shouldReturnText ? emptyTextResult : emptyArrayResult;
+  }
+
+  return shouldReturnText ? formatMessagesAsText(selectedMessages) : selectedMessages;
+}
+
+function registerInternalFilters(liquid: Liquid): Liquid {
+  liquid.registerFilter(
+    INTERNAL_MESSAGE_HELPER_FILTER,
+    function (_input: unknown, helperName: unknown, rawArg: unknown) {
+      const filterContext = this as {
+        context?: { environments?: { messages?: unknown } };
+      };
+      const messages = sanitizeRenderableMessages(
+        filterContext.context?.environments?.messages
+      );
+      return resolveRecentMessagesHelper(helperName, rawArg, messages);
+    }
+  );
+  return liquid;
+}
+
+const engine = registerInternalFilters(
+  new Liquid({
+    cache: true,
+    strictFilters: false,
+    strictVariables: false,
+  })
+);
+
 function sanitizeOutletKey(value: string): string {
   // Keep keys printable and stable for object lookup.
   return value.trim().replace(/\\/g, "\\\\").replace(/'/g, "\\'");
@@ -80,6 +202,26 @@ function resolveRandomMacro(rawMacroBody: string, rng: () => number): string | n
   return pickRandomOption(options, rng);
 }
 
+function rewriteRecentMessageHelperCalls(templateText: string): string {
+  return templateText.replace(LIQUID_SEGMENT_RE, (segment: string) => {
+    const isOutputSegment = segment.startsWith("{{") && segment.endsWith("}}");
+    const isTagSegment = segment.startsWith("{%") && segment.endsWith("%}");
+    if (!isOutputSegment && !isTagSegment) return segment;
+
+    const prefix = segment.slice(0, 2);
+    const suffix = segment.slice(-2);
+    const inner = segment.slice(2, -2);
+    const rewrittenInner = inner.replace(
+      RECENT_MESSAGE_HELPER_RE,
+      (_match: string, helperName: string, rawArg: string) => {
+        const normalizedArg = rawArg.trim().length > 0 ? rawArg.trim() : "nil";
+        return `'' | ${INTERNAL_MESSAGE_HELPER_FILTER}: '${helperName}', ${normalizedArg}`;
+      }
+    );
+    return `${prefix}${rewrittenInner}${suffix}`;
+  });
+}
+
 function preprocessSillyTavernTemplateSyntax(
   templateText: string,
   options?: { rng?: () => number }
@@ -89,31 +231,34 @@ function preprocessSillyTavernTemplateSyntax(
 } {
   const rng = options?.rng ?? Math.random;
   let hasTrimSentinel = false;
-  const text = templateText.replace(MACRO_TAG_RE, (full: string, rawMacroBody: string) => {
-    const macroBody = rawMacroBody.trim();
-    if (!macroBody) return full;
+  const text = rewriteRecentMessageHelperCalls(templateText).replace(
+    MACRO_TAG_RE,
+    (full: string, rawMacroBody: string) => {
+      const macroBody = rawMacroBody.trim();
+      if (!macroBody) return full;
+
+      if (macroBody === "trim") {
+        hasTrimSentinel = true;
+        return TRIM_SENTINEL;
+      }
 
-    if (macroBody === "trim") {
-      hasTrimSentinel = true;
-      return TRIM_SENTINEL;
-    }
+      if (macroBody.startsWith("outlet::")) {
+        const rawKey = macroBody.slice("outlet::".length);
+        if (!rawKey.trim()) return full;
+        const key = sanitizeOutletKey(rawKey);
+        return `{{ outlet['${key}'] }}`;
+      }
 
-    if (macroBody.startsWith("outlet::")) {
-      const rawKey = macroBody.slice("outlet::".length);
-      if (!rawKey.trim()) return full;
-      const key = sanitizeOutletKey(rawKey);
-      return `{{ outlet['${key}'] }}`;
-    }
+      if (macroBody.startsWith("random::")) {
+        const selected = resolveRandomMacro(macroBody, rng);
+        if (selected !== null) return selected;
+        // Keep malformed random macro literal in output.
+        return `{% raw %}${full}{% endraw %}`;
+      }
 
-    if (macroBody.startsWith("random::")) {
-      const selected = resolveRandomMacro(macroBody, rng);
-      if (selected !== null) return selected;
-      // Keep malformed random macro literal in output.
-      return `{% raw %}${full}{% endraw %}`;
+      return full;
     }
-
-    return full;
-  });
+  );
 
   return { text, hasTrimSentinel };
 }
@@ -174,12 +319,7 @@ function findLastMessageByRole(
 function withDerivedMessageAliases(
   context: InstructionRenderContext
 ): InstructionRenderContext {
-  const messages = Array.isArray(context.messages)
-    ? context.messages.filter(
-        (item): item is { role: string; content: string } =>
-          typeof item?.role === "string" && typeof item?.content === "string"
-      )
-    : [];
+  const messages = sanitizeRenderableMessages(context.messages);
 
   // These aliases are derived from effective prompt-visible history.
   // before_main_llm: lastAssistantMessage is the latest assistant message before current user turn.
@@ -230,7 +370,9 @@ export async function renderLiquidTemplate(params: {
   };
 }): Promise<string> {
   const renderEngine = params.options?.strictVariables
-    ? new Liquid({ cache: true, strictFilters: false, strictVariables: true })
+    ? registerInternalFilters(
+        new Liquid({ cache: true, strictFilters: false, strictVariables: true })
+      )
     : engine;
   const renderContext = withDerivedMessageAliases(params.context);
   const maxPasses = params.options?.maxPasses ?? DEFAULT_MAX_PASSES;
diff --git a/web/src/i18n/resources/en/dialogs.ts b/web/src/i18n/resources/en/dialogs.ts
index 9ac1fa19..6053c637 100644
--- a/web/src/i18n/resources/en/dialogs.ts
+++ b/web/src/i18n/resources/en/dialogs.ts
@@ -9,9 +9,12 @@
 			},
 			liquidDocs: {
 				open: 'Open Liquid docs',
+				searchPlaceholder: 'Search tokens, descriptions, and examples',
+				noSearchResults: 'No Liquid docs entries match your search',
 				sections: {
 					usage: 'Usage',
 					variables: 'Variables',
+					methods: 'Methods',
 					macros: 'Macros',
 					examples: 'Examples',
 				},
@@ -77,6 +80,16 @@
 					art: 'Operation artifacts map by tag.',
 					artValue: 'Artifact value by tag, for example art.note.value.',
 				},
+				methods: {
+					recentMessages:
+						'Returns the last N conversational messages with user/assistant roles in chronological order.',
+					recentMessagesText:
+						'Returns the last N conversational messages as text in `role: content` format separated by newlines.',
+					recentMessagesByContextTokens:
+						'Returns the last user/assistant messages until their approximate size reaches tokenLimit. Token counting is approximate and uses the current app heuristic `ceil(chars / 4)` while rounding upward on the last included message.',
+					recentMessagesByContextTokensText:
+						'Same as recentMessagesByContextTokens(tokenLimit), but formatted as newline-separated `role: content` text. Token counting is approximate and uses the current app heuristic `ceil(chars / 4)`.',
+				},
 				macros: {
 					trim: 'Removes surrounding blank lines around macro location.',
 					outlet: 'Shortcut to outlet map lookup by key.',
@@ -119,6 +132,12 @@
 					chatManualEditHistory: {
 						title: 'Manual edit history-aware template',
 					},
+					recentMessagesCount: {
+						title: 'Recent message helpers by count',
+					},
+					recentMessagesTokens: {
+						title: 'Recent message helpers by token budget',
+					},
 				},
 			},
 		};
diff --git a/web/src/i18n/resources/ru/dialogs.ts b/web/src/i18n/resources/ru/dialogs.ts
index 48a9bca5..c77aa55b 100644
--- a/web/src/i18n/resources/ru/dialogs.ts
+++ b/web/src/i18n/resources/ru/dialogs.ts
@@ -9,9 +9,12 @@
 			},
 			liquidDocs: {
 				open: 'Открыть документацию Liquid',
+				searchPlaceholder: 'Поиск по токенам, описаниям и примерам',
+				noSearchResults: 'По вашему запросу ничего не найдено',
 				sections: {
 					usage: 'Где используется',
 					variables: 'Переменные',
+					methods: 'Методы',
 					macros: 'Макросы',
 					examples: 'Примеры',
 				},
@@ -77,6 +80,16 @@
 					art: 'Map артефактов операций по тегам.',
 					artValue: 'Значение артефакта по тегу, например art.note.value.',
 				},
+				methods: {
+					recentMessages:
+						'Возвращает массив последних N сообщений диалога с ролями user/assistant в хронологическом порядке.',
+					recentMessagesText:
+						'Возвращает последние N сообщений диалога как текст в формате `role: content`, разделенный переводами строк.',
+					recentMessagesByContextTokens:
+						'Возвращает массив последних сообщений user/assistant, пока их примерный размер не достигнет tokenLimit. Подсчет токенов приблизительный и использует текущую эвристику приложения `ceil(chars / 4)` с округлением вверх по последнему сообщению.',
+					recentMessagesByContextTokensText:
+						'То же, что recentMessagesByContextTokens(tokenLimit), но в виде текста `role: content` с переводами строк. Подсчет токенов приблизительный и использует текущую эвристику приложения `ceil(chars / 4)`.',
+				},
 				macros: {
 					trim: 'Удаляет лишние пустые строки вокруг позиции макроса.',
 					outlet: 'Короткая форма доступа к outlet по ключу.',
@@ -119,6 +132,12 @@
 					chatManualEditHistory: {
 						title: 'Шаблон с учетом истории при ручном редактировании',
 					},
+					recentMessagesCount: {
+						title: 'Методы последних сообщений по количеству',
+					},
+					recentMessagesTokens: {
+						title: 'Методы последних сообщений по токен-бюджету',
+					},
 				},
 			},
 		};
diff --git a/web/src/ui/liquid-template-docs-config.ts b/web/src/ui/liquid-template-docs-config.ts
index 6a6f3f2c..fd7bbc09 100644
--- a/web/src/ui/liquid-template-docs-config.ts
+++ b/web/src/ui/liquid-template-docs-config.ts
@@ -16,6 +16,11 @@ export type MacroDoc = {
 	descriptionKey: string;
 };
 
+export type MethodDoc = {
+	token: string;
+	descriptionKey: string;
+};
+
 export type ExampleDoc = {
 	titleKey: string;
 	template: string;
@@ -25,6 +30,7 @@ export type LiquidDocsModel = {
 	titleKey: string;
 	usageKey: string;
 	variables: VariableDoc[];
+	methods: MethodDoc[];
 	macros: MacroDoc[];
 	examples: ExampleDoc[];
 };
@@ -74,11 +80,37 @@ const COMMON_MACROS: MacroDoc[] = [
 	{ token: '{{random::A::B::C}}', descriptionKey: 'dialogs.liquidDocs.macros.random' },
 ];
 
+const COMMON_METHODS: MethodDoc[] = [
+	{ token: '{{recentMessages(3)}}', descriptionKey: 'dialogs.liquidDocs.methods.recentMessages' },
+	{ token: '{{recentMessagesText(3)}}', descriptionKey: 'dialogs.liquidDocs.methods.recentMessagesText' },
+	{
+		token: '{{recentMessagesByContextTokens(256)}}',
+		descriptionKey: 'dialogs.liquidDocs.methods.recentMessagesByContextTokens',
+	},
+	{
+		token: '{{recentMessagesByContextTokensText(256)}}',
+		descriptionKey: 'dialogs.liquidDocs.methods.recentMessagesByContextTokensText',
+	},
+];
+
+const MESSAGE_HELPER_EXAMPLES: ExampleDoc[] = [
+	{
+		titleKey: 'dialogs.liquidDocs.examples.recentMessagesCount.title',
+		template:
+			'{% assign recent = recentMessages(3) %}\nRecent count: {{recent | size}}\n{% for msg in recent %}{{msg.role}}: {{msg.content}}\n{% endfor %}',
+	},
+	{
+		titleKey: 'dialogs.liquidDocs.examples.recentMessagesTokens.title',
+		template: 'Recent text by token budget:\n{{recentMessagesByContextTokensText(256)}}',
+	},
+];
+
 export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel> = {
 	instruction: {
 		titleKey: 'dialogs.liquidDocs.contexts.instruction.title',
 		usageKey: 'dialogs.liquidDocs.contexts.instruction.usage',
 		variables: BASE_VARIABLES,
+		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
 		examples: [
 			{
@@ -90,12 +122,14 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 				titleKey: 'dialogs.liquidDocs.examples.instructionOutlet.title',
 				template: "Memory:\n{{outlet::default}}\nTone: {{random::calm::tense::neutral}}",
 			},
+			...MESSAGE_HELPER_EXAMPLES,
 		],
 	},
 	operation_template: {
 		titleKey: 'dialogs.liquidDocs.contexts.operationTemplate.title',
 		usageKey: 'dialogs.liquidDocs.contexts.operationTemplate.usage',
 		variables: [...BASE_VARIABLES, ...OPERATION_VARIABLES],
+		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
 		examples: [
 			{
@@ -106,12 +140,14 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 				titleKey: 'dialogs.liquidDocs.examples.operationTemplatePromptTime.title',
 				template: 'Inject after user:\nCharacter={{char.name}}\nPersona={{user.name}}',
 			},
+			...MESSAGE_HELPER_EXAMPLES,
 		],
 	},
 	operation_llm: {
 		titleKey: 'dialogs.liquidDocs.contexts.operationLlm.title',
 		usageKey: 'dialogs.liquidDocs.contexts.operationLlm.usage',
 		variables: [...BASE_VARIABLES, ...OPERATION_VARIABLES],
+		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
 		examples: [
 			{
@@ -122,12 +158,14 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 				titleKey: 'dialogs.liquidDocs.examples.operationLlmPrompt.title',
 				template: 'User asks for next step.\nLast messages count: {{messages | size}}',
 			},
+			...MESSAGE_HELPER_EXAMPLES,
 		],
 	},
 	entity_profile: {
 		titleKey: 'dialogs.liquidDocs.contexts.entityProfile.title',
 		usageKey: 'dialogs.liquidDocs.contexts.entityProfile.usage',
 		variables: BASE_VARIABLES,
+		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
 		examples: [
 			{
@@ -138,12 +176,14 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 				titleKey: 'dialogs.liquidDocs.examples.entityProfileIndirect.title',
 				template: '{{description}}\n{{scenario}}',
 			},
+			...MESSAGE_HELPER_EXAMPLES,
 		],
 	},
 	world_info_entry: {
 		titleKey: 'dialogs.liquidDocs.contexts.worldInfoEntry.title',
 		usageKey: 'dialogs.liquidDocs.contexts.worldInfoEntry.usage',
 		variables: BASE_VARIABLES,
+		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
 		examples: [
 			{
@@ -154,12 +194,14 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 				titleKey: 'dialogs.liquidDocs.examples.worldInfoEntryOutlet.title',
 				template: 'Outlet merge:\n{{outlet::default}}\n{{trim}}\n{{wiAfter}}',
 			},
+			...MESSAGE_HELPER_EXAMPLES,
 		],
 	},
 	chat_manual_edit: {
 		titleKey: 'dialogs.liquidDocs.contexts.chatManualEdit.title',
 		usageKey: 'dialogs.liquidDocs.contexts.chatManualEdit.usage',
 		variables: BASE_VARIABLES,
+		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
 		examples: [
 			{
@@ -170,6 +212,7 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 				titleKey: 'dialogs.liquidDocs.examples.chatManualEditHistory.title',
 				template: 'History items: {{messages | size}}\n{{random::short::detailed}} reply.',
 			},
+			...MESSAGE_HELPER_EXAMPLES,
 		],
 	},
 };
diff --git a/web/src/ui/liquid-template-docs.tsx b/web/src/ui/liquid-template-docs.tsx
index 6ca6033b..b748bbaa 100644
--- a/web/src/ui/liquid-template-docs.tsx
+++ b/web/src/ui/liquid-template-docs.tsx
@@ -1,5 +1,5 @@
-import { Button, Group, Paper, Stack, Text } from '@mantine/core';
-import { useState } from 'react';
+import { Button, Group, Paper, Stack, Text, TextInput } from '@mantine/core';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { LuFileText } from 'react-icons/lu';
 
@@ -10,6 +10,10 @@ import { Z_INDEX } from './z-index';
 
 export type { LiquidDocsContextId } from './liquid-template-docs-config';
 
+function matchesSearch(haystack: string, query: string): boolean {
+	return haystack.toLocaleLowerCase().includes(query);
+}
+
 type LiquidDocsDialogProps = {
 	context: LiquidDocsContextId;
 	open: boolean;
@@ -18,15 +22,64 @@ type LiquidDocsDialogProps = {
 
 export const LiquidDocsDialog: React.FC<LiquidDocsDialogProps> = ({ context, open, onOpenChange }) => {
 	const { t } = useTranslation();
+	const [search, setSearch] = useState('');
 	const model = LIQUID_DOCS_BY_CONTEXT[context];
 	if (!model) return null;
 
+	useEffect(() => {
+		if (!open) setSearch('');
+	}, [open]);
+
+	const normalizedQuery = search.trim().toLocaleLowerCase();
+	const usageMatches =
+		normalizedQuery.length === 0 ||
+		matchesSearch(t(model.titleKey), normalizedQuery) ||
+		matchesSearch(t(model.usageKey), normalizedQuery);
+	const filteredVariables =
+		normalizedQuery.length === 0
+			? model.variables
+			: model.variables.filter(
+					(item) =>
+						matchesSearch(item.token, normalizedQuery) ||
+						matchesSearch(t(item.descriptionKey), normalizedQuery)
+			  );
+	const filteredMethods =
+		normalizedQuery.length === 0
+			? model.methods
+			: model.methods.filter(
+					(item) =>
+						matchesSearch(item.token, normalizedQuery) ||
+						matchesSearch(t(item.descriptionKey), normalizedQuery)
+			  );
+	const filteredMacros =
+		normalizedQuery.length === 0
+			? model.macros
+			: model.macros.filter(
+					(item) =>
+						matchesSearch(item.token, normalizedQuery) ||
+						matchesSearch(t(item.descriptionKey), normalizedQuery)
+			  );
+	const filteredExamples =
+		normalizedQuery.length === 0
+			? model.examples
+			: model.examples.filter(
+					(item) =>
+						matchesSearch(t(item.titleKey), normalizedQuery) ||
+						matchesSearch(item.template, normalizedQuery)
+			  );
+	const hasResults =
+		usageMatches ||
+		filteredVariables.length > 0 ||
+		filteredMethods.length > 0 ||
+		filteredMacros.length > 0 ||
+		filteredExamples.length > 0;
+
 	return (
 		<Dialog
 			open={open}
 			onOpenChange={onOpenChange}
 			title={t(model.titleKey)}
-			size="lg"
+			size="xl"
 			zIndex={Z_INDEX.overlay.modalChild}
 			footer={
 				<Button variant="subtle" onClick={() => onOpenChange(false)}>
@@ -35,92 +88,140 @@ export const LiquidDocsDialog: React.FC<LiquidDocsDialogProps> = ({ context, ope
 			}
 		>
 			<Stack gap="md">
-				<Stack gap={4}>
-					<Text size="sm" fw={600}>
-						{t('dialogs.liquidDocs.sections.usage')}
-					</Text>
+				<TextInput
+					value={search}
+					onChange={(event) => setSearch(event.currentTarget.value)}
+					placeholder={t('dialogs.liquidDocs.searchPlaceholder')}
+				/>
+
+				{!hasResults ? (
 					<Text size="sm" c="dimmed">
-						{t(model.usageKey)}
+						{t('dialogs.liquidDocs.noSearchResults')}
 					</Text>
-				</Stack>
+				) : null}
 
-				<Stack gap={4}>
-					<Text size="sm" fw={600}>
-						{t('dialogs.liquidDocs.sections.variables')}
-					</Text>
-					<Stack gap="xs">
-						{model.variables.map((item) => (
-							<Paper key={item.token} withBorder p="xs" radius="md">
-								<Text
-									size="xs"
-									style={{
-										fontFamily:
-											'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
-										whiteSpace: 'pre-wrap',
-										wordBreak: 'break-word',
-									}}
-								>
-									{item.token}
-								</Text>
-								<Text size="sm" c="dimmed">
-									{t(item.descriptionKey)}
-								</Text>
-							</Paper>
-						))}
+				{usageMatches ? (
+					<Stack gap={4}>
+						<Text size="sm" fw={600}>
+							{t('dialogs.liquidDocs.sections.usage')}
+						</Text>
+						<Text size="sm" c="dimmed">
+							{t(model.usageKey)}
+						</Text>
 					</Stack>
-				</Stack>
+				) : null}
 
-				<Stack gap={4}>
-					<Text size="sm" fw={600}>
-						{t('dialogs.liquidDocs.sections.macros')}
-					</Text>
-					<Stack gap="xs">
-						{model.macros.map((item) => (
-							<Paper key={item.token} withBorder p="xs" radius="md">
-								<Text
-									size="xs"
-									style={{
-										fontFamily:
-											'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
-										whiteSpace: 'pre-wrap',
-										wordBreak: 'break-word',
-									}}
-								>
-									{item.token}
-								</Text>
-								<Text size="sm" c="dimmed">
-									{t(item.descriptionKey)}
-								</Text>
-							</Paper>
-						))}
+				{filteredVariables.length > 0 ? (
+					<Stack gap={4}>
+						<Text size="sm" fw={600}>
+							{t('dialogs.liquidDocs.sections.variables')}
+						</Text>
+						<Stack gap="xs">
+							{filteredVariables.map((item) => (
+								<Paper key={item.token} withBorder p="xs" radius="md">
+									<Text
+										size="xs"
+										style={{
+											fontFamily:
+												'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
+											whiteSpace: 'pre-wrap',
+											wordBreak: 'break-word',
+										}}
+									>
+										{item.token}
+									</Text>
+									<Text size="sm" c="dimmed">
+										{t(item.descriptionKey)}
+									</Text>
+								</Paper>
+							))}
+						</Stack>
 					</Stack>
-				</Stack>
+				) : null}
 
-				<Stack gap={4}>
-					<Text size="sm" fw={600}>
-						{t('dialogs.liquidDocs.sections.examples')}
-					</Text>
-					<Stack gap="xs">
-						{model.examples.map((item) => (
-							<Paper key={item.titleKey} withBorder p="xs" radius="md">
-								<Text size="sm" fw={500} mb={4}>
-									{t(item.titleKey)}
-								</Text>
-								<Text
-									size="xs"
-									style={{
-										fontFamily:
-											'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
-										whiteSpace: 'pre-wrap',
-										wordBreak: 'break-word',
-									}}
-								>
-									{item.template}
-								</Text>
-							</Paper>
-						))}
+				{filteredMethods.length > 0 ? (
+					<Stack gap={4}>
+						<Text size="sm" fw={600}>
+							{t('dialogs.liquidDocs.sections.methods')}
+						</Text>
+						<Stack gap="xs">
+							{filteredMethods.map((item) => (
+								<Paper key={item.token} withBorder p="xs" radius="md">
+									<Text
+										size="xs"
+										style={{
+											fontFamily:
+												'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
+											whiteSpace: 'pre-wrap',
+											wordBreak: 'break-word',
+										}}
+									>
+										{item.token}
+									</Text>
+									<Text size="sm" c="dimmed">
+										{t(item.descriptionKey)}
+									</Text>
+								</Paper>
+							))}
+						</Stack>
+					</Stack>
+				) : null}
+
+				{filteredMacros.length > 0 ? (
+					<Stack gap={4}>
+						<Text size="sm" fw={600}>
+							{t('dialogs.liquidDocs.sections.macros')}
+						</Text>
+						<Stack gap="xs">
+							{filteredMacros.map((item) => (
+								<Paper key={item.token} withBorder p="xs" radius="md">
+									<Text
+										size="xs"
+										style={{
+											fontFamily:
+												'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
+											whiteSpace: 'pre-wrap',
+											wordBreak: 'break-word',
+										}}
+									>
+										{item.token}
+									</Text>
+									<Text size="sm" c="dimmed">
+										{t(item.descriptionKey)}
+									</Text>
+								</Paper>
+							))}
+						</Stack>
+					</Stack>
+				) : null}
+
+				{filteredExamples.length > 0 ? (
+					<Stack gap={4}>
+						<Text size="sm" fw={600}>
+							{t('dialogs.liquidDocs.sections.examples')}
+						</Text>
+						<Stack gap="xs">
+							{filteredExamples.map((item) => (
+								<Paper key={item.titleKey} withBorder p="xs" radius="md">
+									<Text size="sm" fw={500} mb={4}>
+										{t(item.titleKey)}
+									</Text>
+									<Text
+										size="xs"
+										style={{
+											fontFamily:
+												'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
+											whiteSpace: 'pre-wrap',
+											wordBreak: 'break-word',
+										}}
+									>
+										{item.template}
+									</Text>
+								</Paper>
+							))}
+						</Stack>
 					</Stack>
-				</Stack>
+				) : null}
 			</Stack>
 		</Dialog>
 	);

From d409b788ab981905017f9f1378e0d66a830d1267 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sun, 8 Mar 2026 22:02:31 +0300
Subject: [PATCH 04/54] fix: up

---
 server/src/api/legacy-route-wrappers.test.ts | 18 ++++++++++---
 web/src/i18n/resources/en/dialogs.ts         | 28 +-------------------
 web/src/i18n/resources/ru/dialogs.ts         | 28 +-------------------
 web/src/ui/liquid-template-docs-config.ts    | 14 ----------
 web/src/ui/liquid-template-docs.tsx          | 18 +------------
 5 files changed, 18 insertions(+), 88 deletions(-)

diff --git a/server/src/api/legacy-route-wrappers.test.ts b/server/src/api/legacy-route-wrappers.test.ts
index 4141750e..3fa3f71b 100644
--- a/server/src/api/legacy-route-wrappers.test.ts
+++ b/server/src/api/legacy-route-wrappers.test.ts
@@ -1,10 +1,20 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import * as path from "node:path";
 import { afterEach, describe, expect, test } from "vitest";
 
-import { createApp } from "../app";
+import { bootstrapApp, createApp } from "../app";
+import { resetDbForTests } from "../db/client";
 
 import type { Server } from "node:http";
 
-async function requestJson(path: string): Promise<Response> {
+async function requestJson(requestPath: string): Promise<Response> {
+  resetDbForTests();
+  const tempDir = await fs.mkdtemp(
+    path.join(os.tmpdir(), "talespinner-legacy-routes-")
+  );
+  const dbPath = path.join(tempDir, "db.sqlite");
+  await bootstrapApp({ dbPath });
   const app = createApp();
   const server = await new Promise<Server>((resolve) => {
     const started = app.listen(0, () => resolve(started));
@@ -15,11 +25,13 @@ async function requestJson(path: string): Promise<Response> {
     if (!address || typeof address === "string") {
       throw new Error("Failed to resolve test server address");
     }
-    return await fetch(`http://127.0.0.1:${address.port}${path}`);
+    return await fetch(`http://127.0.0.1:${address.port}${requestPath}`);
   } finally {
     await new Promise<void>((resolve, reject) => {
       server.close((error) => (error ? reject(error) : resolve()));
     });
+    resetDbForTests();
+    await fs.rm(tempDir, { recursive: true, force: true });
   }
 }
 
diff --git a/web/src/i18n/resources/en/dialogs.ts b/web/src/i18n/resources/en/dialogs.ts
index 6053c637..0cbc5e58 100644
--- a/web/src/i18n/resources/en/dialogs.ts
+++ b/web/src/i18n/resources/en/dialogs.ts
@@ -8,42 +8,16 @@
 				},
 			},
 			liquidDocs: {
+				title: 'Liquid reference',
 				open: 'Open Liquid docs',
 				searchPlaceholder: 'Search tokens, descriptions, and examples',
 				noSearchResults: 'No Liquid docs entries match your search',
 				sections: {
-					usage: 'Usage',
 					variables: 'Variables',
 					methods: 'Methods',
 					macros: 'Macros',
 					examples: 'Examples',
 				},
-				contexts: {
-					instruction: {
-						title: 'Instruction Liquid docs',
-						usage: 'Used when rendering chat instructions before generation.',
-					},
-					operationTemplate: {
-						title: 'Template operation Liquid docs',
-						usage: 'Used by operation kind=template for rendered effect payloads.',
-					},
-					operationLlm: {
-						title: 'LLM operation Liquid docs',
-						usage: 'Used by operation kind=llm for system and user prompt rendering.',
-					},
-					entityProfile: {
-						title: 'Entity profile Liquid docs',
-						usage: 'Liquid can be resolved in profile text fields directly and through multi-pass usage in other templates.',
-					},
-					worldInfoEntry: {
-						title: 'World Info Liquid docs',
-						usage: 'Used when rendering World Info entry content in runtime context.',
-					},
-					chatManualEdit: {
-						title: 'Manual edit Liquid docs',
-						usage: 'Used when chat message part is edited manually and rendered via Liquid.',
-					},
-				},
 				variables: {
 					char: 'Character object alias. Works as string and as object.',
 					charName: 'Character name from current entity profile.',
diff --git a/web/src/i18n/resources/ru/dialogs.ts b/web/src/i18n/resources/ru/dialogs.ts
index c77aa55b..1dc4c858 100644
--- a/web/src/i18n/resources/ru/dialogs.ts
+++ b/web/src/i18n/resources/ru/dialogs.ts
@@ -8,42 +8,16 @@
 				},
 			},
 			liquidDocs: {
+				title: 'Справка по Liquid',
 				open: 'Открыть документацию Liquid',
 				searchPlaceholder: 'Поиск по токенам, описаниям и примерам',
 				noSearchResults: 'По вашему запросу ничего не найдено',
 				sections: {
-					usage: 'Где используется',
 					variables: 'Переменные',
 					methods: 'Методы',
 					macros: 'Макросы',
 					examples: 'Примеры',
 				},
-				contexts: {
-					instruction: {
-						title: 'Liquid для инструкций',
-						usage: 'Используется при рендере инструкций чата перед генерацией.',
-					},
-					operationTemplate: {
-						title: 'Liquid для template-операции',
-						usage: 'Используется в operation kind=template для рендера payload эффектов.',
-					},
-					operationLlm: {
-						title: 'Liquid для llm-операции',
-						usage: 'Используется в operation kind=llm для рендера system и user prompt.',
-					},
-					entityProfile: {
-						title: 'Liquid для полей профиля',
-						usage: 'Liquid может раскрываться в текстовых полях профиля напрямую и косвенно через multi-pass в других шаблонах.',
-					},
-					worldInfoEntry: {
-						title: 'Liquid для World Info',
-						usage: 'Используется при рендере content записей World Info в runtime-контексте.',
-					},
-					chatManualEdit: {
-						title: 'Liquid для ручного редактирования',
-						usage: 'Используется при ручном редактировании части сообщения и рендере через Liquid.',
-					},
-				},
 				variables: {
 					char: 'Алиас объекта персонажа. Работает как строка и как объект.',
 					charName: 'Имя персонажа из текущего entity profile.',
diff --git a/web/src/ui/liquid-template-docs-config.ts b/web/src/ui/liquid-template-docs-config.ts
index fd7bbc09..d5754a88 100644
--- a/web/src/ui/liquid-template-docs-config.ts
+++ b/web/src/ui/liquid-template-docs-config.ts
@@ -27,8 +27,6 @@ export type ExampleDoc = {
 };
 
 export type LiquidDocsModel = {
-	titleKey: string;
-	usageKey: string;
 	variables: VariableDoc[];
 	methods: MethodDoc[];
 	macros: MacroDoc[];
@@ -107,8 +105,6 @@ const MESSAGE_HELPER_EXAMPLES: ExampleDoc[] = [
 
 export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel> = {
 	instruction: {
-		titleKey: 'dialogs.liquidDocs.contexts.instruction.title',
-		usageKey: 'dialogs.liquidDocs.contexts.instruction.usage',
 		variables: BASE_VARIABLES,
 		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
@@ -126,8 +122,6 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 		],
 	},
 	operation_template: {
-		titleKey: 'dialogs.liquidDocs.contexts.operationTemplate.title',
-		usageKey: 'dialogs.liquidDocs.contexts.operationTemplate.usage',
 		variables: [...BASE_VARIABLES, ...OPERATION_VARIABLES],
 		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
@@ -144,8 +138,6 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 		],
 	},
 	operation_llm: {
-		titleKey: 'dialogs.liquidDocs.contexts.operationLlm.title',
-		usageKey: 'dialogs.liquidDocs.contexts.operationLlm.usage',
 		variables: [...BASE_VARIABLES, ...OPERATION_VARIABLES],
 		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
@@ -162,8 +154,6 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 		],
 	},
 	entity_profile: {
-		titleKey: 'dialogs.liquidDocs.contexts.entityProfile.title',
-		usageKey: 'dialogs.liquidDocs.contexts.entityProfile.usage',
 		variables: BASE_VARIABLES,
 		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
@@ -180,8 +170,6 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 		],
 	},
 	world_info_entry: {
-		titleKey: 'dialogs.liquidDocs.contexts.worldInfoEntry.title',
-		usageKey: 'dialogs.liquidDocs.contexts.worldInfoEntry.usage',
 		variables: BASE_VARIABLES,
 		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
@@ -198,8 +186,6 @@ export const LIQUID_DOCS_BY_CONTEXT: Record<LiquidDocsContextId, LiquidDocsModel
 		],
 	},
 	chat_manual_edit: {
-		titleKey: 'dialogs.liquidDocs.contexts.chatManualEdit.title',
-		usageKey: 'dialogs.liquidDocs.contexts.chatManualEdit.usage',
 		variables: BASE_VARIABLES,
 		methods: COMMON_METHODS,
 		macros: COMMON_MACROS,
diff --git a/web/src/ui/liquid-template-docs.tsx b/web/src/ui/liquid-template-docs.tsx
index b748bbaa..0ade1a9c 100644
--- a/web/src/ui/liquid-template-docs.tsx
+++ b/web/src/ui/liquid-template-docs.tsx
@@ -31,10 +31,6 @@ export const LiquidDocsDialog: React.FC<LiquidDocsDialogProps> = ({ context, ope
 	}, [open]);
 
 	const normalizedQuery = search.trim().toLocaleLowerCase();
-	const usageMatches =
-		normalizedQuery.length === 0 ||
-		matchesSearch(t(model.titleKey), normalizedQuery) ||
-		matchesSearch(t(model.usageKey), normalizedQuery);
 	const filteredVariables =
 		normalizedQuery.length === 0
 			? model.variables
@@ -68,7 +64,6 @@ export const LiquidDocsDialog: React.FC<LiquidDocsDialogProps> = ({ context, ope
 						matchesSearch(item.template, normalizedQuery)
 			  );
 	const hasResults =
-		usageMatches ||
 		filteredVariables.length > 0 ||
 		filteredMethods.length > 0 ||
 		filteredMacros.length > 0 ||
@@ -78,7 +73,7 @@ export const LiquidDocsDialog: React.FC<LiquidDocsDialogProps> = ({ context, ope
 		<Dialog
 			open={open}
 			onOpenChange={onOpenChange}
-			title={t(model.titleKey)}
+			title={t('dialogs.liquidDocs.title')}
 			size="xl"
 			zIndex={Z_INDEX.overlay.modalChild}
 			footer={
@@ -100,17 +95,6 @@ export const LiquidDocsDialog: React.FC<LiquidDocsDialogProps> = ({ context, ope
 					</Text>
 				) : null}
 
-				{usageMatches ? (
-					<Stack gap={4}>
-						<Text size="sm" fw={600}>
-							{t('dialogs.liquidDocs.sections.usage')}
-						</Text>
-						<Text size="sm" c="dimmed">
-							{t(model.usageKey)}
-						</Text>
-					</Stack>
-				) : null}
-
 				{filteredVariables.length > 0 ? (
 					<Stack gap={4}>
 						<Text size="sm" fw={600}>

From 623e7fdbbe59f1d79a134cb41af0b29457d18ea6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Mon, 9 Mar 2026 01:45:52 +0300
Subject: [PATCH 05/54] fix: st template

---
 ...completion-presets-implementation-notes.md |  23 +
 ...8_ui_app_settings_bind_chat_completion.sql |   2 +
 server/drizzle/meta/_journal.json             |   7 +
 server/src/db/schema/ui.ts                    |   6 +
 server/src/routes/app-settings-routes.test.ts |   1 +
 server/src/routes/app-settings-routes.ts      |   1 +
 .../app-settings-repository.test.ts           | 101 +--
 .../app-settings/app-settings-repository.ts   |  19 +
 shared/types/app-settings.ts                  |   1 +
 shared/types/instructions.ts                  |   1 +
 .../features/sidebars/instructions/index.tsx  | 622 ++++++++++++++----
 .../instructions/instruction-editor.tsx       | 150 +++--
 web/src/i18n/resources/en/instructions.ts     | 141 ++--
 web/src/i18n/resources/en/provider.ts         | 179 +++--
 web/src/i18n/resources/ru/instructions.ts     | 141 ++--
 web/src/i18n/resources/ru/provider.ts         | 179 +++--
 web/src/model/app-settings/index.ts           |   1 +
 web/src/model/instructions/index.ts           |  12 +
 web/src/model/instructions/st-preset.ts       | 213 +++++-
 19 files changed, 1264 insertions(+), 536 deletions(-)
 create mode 100644 knowledge-base/st-chat-completion-presets-implementation-notes.md
 create mode 100644 server/drizzle/0028_ui_app_settings_bind_chat_completion.sql

diff --git a/knowledge-base/st-chat-completion-presets-implementation-notes.md b/knowledge-base/st-chat-completion-presets-implementation-notes.md
new file mode 100644
index 00000000..74b1d86f
--- /dev/null
+++ b/knowledge-base/st-chat-completion-presets-implementation-notes.md
@@ -0,0 +1,23 @@
+# ST-like Chat Completion Presets — implementation notes
+
+## Decisions
+- Canonical ST preset storage uses existing `instructions` records with `tsInstruction.mode = st_advanced`.
+- Active preset remains per-chat through `instructionId`.
+- Existing provider-side `llm-presets` stay separate and are relabeled as connection presets.
+- Global bind toggle is persisted in app settings as `bindChatCompletionPresetToConnection`.
+
+## Best-effort bind mapping
+- `chat_completion_source = openrouter` -> `activeProviderId = openrouter`
+- any other explicit `chat_completion_source` -> `activeProviderId = openai_compatible`
+- `openai_model` -> `activeModel`
+- sensitive/raw-only connection fields are preserved for round-trip export but are not auto-applied
+
+## Round-trip rules
+- `rawPreset` remains the source for unknown ST keys
+- edited prompt blocks, prompt order, and response config overwrite only supported fields during export
+- unsupported connection fields stay raw-only and surface warnings instead of failing import/apply
+
+## Intentional gaps
+- No new dedicated backend entity/API for ST presets
+- No automatic migration from provider-side `llm-presets`
+- No direct auto-apply for sensitive fields like `custom_url`, `reverse_proxy`, or token secrets
diff --git a/server/drizzle/0028_ui_app_settings_bind_chat_completion.sql b/server/drizzle/0028_ui_app_settings_bind_chat_completion.sql
new file mode 100644
index 00000000..91cba66d
--- /dev/null
+++ b/server/drizzle/0028_ui_app_settings_bind_chat_completion.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `ui_app_settings`
+ADD COLUMN `bind_chat_completion_preset_to_connection` integer DEFAULT false NOT NULL;
diff --git a/server/drizzle/meta/_journal.json b/server/drizzle/meta/_journal.json
index e49a6a36..050f76c6 100644
--- a/server/drizzle/meta/_journal.json
+++ b/server/drizzle/meta/_journal.json
@@ -169,6 +169,13 @@
       "when": 1772790000000,
       "tag": "0027_generation_runtime_control",
       "breakpoints": true
+    },
+    {
+      "idx": 24,
+      "version": "7",
+      "when": 1773012000000,
+      "tag": "0028_ui_app_settings_bind_chat_completion",
+      "breakpoints": true
     }
   ]
 }
diff --git a/server/src/db/schema/ui.ts b/server/src/db/schema/ui.ts
index 582b1798..07269154 100644
--- a/server/src/db/schema/ui.ts
+++ b/server/src/db/schema/ui.ts
@@ -13,6 +13,12 @@ export const uiAppSettings = sqliteTable("ui_app_settings", {
   autoSelectCurrentPersona: integer("auto_select_current_persona", { mode: "boolean" })
     .notNull()
     .default(false),
+  bindChatCompletionPresetToConnection: integer(
+    "bind_chat_completion_preset_to_connection",
+    { mode: "boolean" }
+  )
+    .notNull()
+    .default(false),
   createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
   updatedAt: integer("updated_at", { mode: "timestamp_ms" }).notNull(),
 });
diff --git a/server/src/routes/app-settings-routes.test.ts b/server/src/routes/app-settings-routes.test.ts
index 5c58cad8..6e2fc4e6 100644
--- a/server/src/routes/app-settings-routes.test.ts
+++ b/server/src/routes/app-settings-routes.test.ts
@@ -13,6 +13,7 @@ describe("app settings route schema", () => {
       language: "en",
       openLastChat: true,
       autoSelectCurrentPersona: false,
+      bindChatCompletionPresetToConnection: true,
     });
 
     expect(parsed.success).toBe(true);
diff --git a/server/src/routes/app-settings-routes.ts b/server/src/routes/app-settings-routes.ts
index 2211a745..b33193f8 100644
--- a/server/src/routes/app-settings-routes.ts
+++ b/server/src/routes/app-settings-routes.ts
@@ -14,6 +14,7 @@ export const appSettingsPatchSchema = z
     language: z.enum(["ru", "en"]).optional(),
     openLastChat: z.boolean().optional(),
     autoSelectCurrentPersona: z.boolean().optional(),
+    bindChatCompletionPresetToConnection: z.boolean().optional(),
   })
   .strict();
 
diff --git a/server/src/services/app-settings/app-settings-repository.test.ts b/server/src/services/app-settings/app-settings-repository.test.ts
index cead9599..3023f0b9 100644
--- a/server/src/services/app-settings/app-settings-repository.test.ts
+++ b/server/src/services/app-settings/app-settings-repository.test.ts
@@ -5,85 +5,34 @@ import {
   normalizeLegacyAppSettings,
 } from "./app-settings-repository";
 
-describe("app settings legacy normalization", () => {
-  test("normalizes flat valid object", () => {
-    const normalized = normalizeLegacyAppSettings({
-      language: "en",
-      openLastChat: true,
-      autoSelectCurrentPersona: true,
-    });
-
-    expect(normalized).toEqual({
-      language: "en",
-      openLastChat: true,
-      autoSelectCurrentPersona: true,
-    });
-  });
-
-  test("unwraps recursive data chain and keeps deepest valid values", () => {
-    const normalized = normalizeLegacyAppSettings({
-      language: "ru",
-      openLastChat: true,
-      autoSelectCurrentPersona: false,
-      data: {
-        language: "en",
-        openLastChat: false,
-        autoSelectCurrentPersona: true,
-      },
-    });
-
-    expect(normalized).toEqual({
-      language: "en",
-      openLastChat: false,
-      autoSelectCurrentPersona: true,
-    });
-  });
-
-  test("falls back for partially broken values", () => {
-    const normalized = normalizeLegacyAppSettings({
-      language: "de",
-      openLastChat: "yes",
-      autoSelectCurrentPersona: 1,
-      data: { language: "ru" },
-    });
-
-    expect(normalized).toEqual({
-      language: "ru",
-      openLastChat: false,
-      autoSelectCurrentPersona: false,
+describe("app-settings-repository", () => {
+  test("normalizes bind setting from legacy payload", () => {
+    expect(
+      normalizeLegacyAppSettings({
+        data: {
+          bindChatCompletionPresetToConnection: true,
+        },
+      })
+    ).toMatchObject({
+      bindChatCompletionPresetToConnection: true,
     });
   });
 
-  test("returns defaults when source is missing or non-object", () => {
-    expect(normalizeLegacyAppSettings(null)).toEqual({
-      language: "ru",
-      openLastChat: false,
-      autoSelectCurrentPersona: false,
-    });
-    expect(normalizeLegacyAppSettings("")).toEqual({
-      language: "ru",
-      openLastChat: false,
-      autoSelectCurrentPersona: false,
-    });
-  });
-});
-
-describe("app settings merge", () => {
-  test("updates only whitelist fields", () => {
-    const current = {
-      language: "ru" as const,
-      openLastChat: false,
-      autoSelectCurrentPersona: false,
-    };
-    const merged = mergeAppSettings(current, {
-      language: "en",
-      openLastChat: true,
-    } as any);
-
-    expect(merged).toEqual({
-      language: "en",
-      openLastChat: true,
-      autoSelectCurrentPersona: false,
+  test("merges bind setting patch", () => {
+    expect(
+      mergeAppSettings(
+        {
+          language: "ru",
+          openLastChat: false,
+          autoSelectCurrentPersona: false,
+          bindChatCompletionPresetToConnection: false,
+        },
+        {
+          bindChatCompletionPresetToConnection: true,
+        }
+      )
+    ).toMatchObject({
+      bindChatCompletionPresetToConnection: true,
     });
   });
 });
diff --git a/server/src/services/app-settings/app-settings-repository.ts b/server/src/services/app-settings/app-settings-repository.ts
index e5f1c3e4..08276c81 100644
--- a/server/src/services/app-settings/app-settings-repository.ts
+++ b/server/src/services/app-settings/app-settings-repository.ts
@@ -15,6 +15,7 @@ const DEFAULT_APP_SETTINGS: AppSettings = {
   language: "ru",
   openLastChat: false,
   autoSelectCurrentPersona: false,
+  bindChatCompletionPresetToConnection: false,
 };
 
 function isObjectRecord(value: unknown): value is Record<string, unknown> {
@@ -52,6 +53,10 @@ export function normalizeLegacyAppSettings(input: unknown): AppSettings {
     if (typeof item.autoSelectCurrentPersona === "boolean") {
       result.autoSelectCurrentPersona = item.autoSelectCurrentPersona;
     }
+    if (typeof item.bindChatCompletionPresetToConnection === "boolean") {
+      result.bindChatCompletionPresetToConnection =
+        item.bindChatCompletionPresetToConnection;
+    }
   }
 
   return result;
@@ -71,6 +76,10 @@ export function mergeAppSettings(
       typeof patch.autoSelectCurrentPersona === "boolean"
         ? patch.autoSelectCurrentPersona
         : current.autoSelectCurrentPersona,
+    bindChatCompletionPresetToConnection:
+      typeof patch.bindChatCompletionPresetToConnection === "boolean"
+        ? patch.bindChatCompletionPresetToConnection
+        : current.bindChatCompletionPresetToConnection,
   };
 }
 
@@ -79,6 +88,8 @@ function rowToDto(row: typeof uiAppSettings.$inferSelect): AppSettings {
     language: row.language,
     openLastChat: row.openLastChat,
     autoSelectCurrentPersona: row.autoSelectCurrentPersona,
+    bindChatCompletionPresetToConnection:
+      row.bindChatCompletionPresetToConnection,
   };
 }
 
@@ -102,6 +113,8 @@ async function insertInitialSettings(settings: AppSettings): Promise<void> {
       language: settings.language,
       openLastChat: settings.openLastChat,
       autoSelectCurrentPersona: settings.autoSelectCurrentPersona,
+      bindChatCompletionPresetToConnection:
+        settings.bindChatCompletionPresetToConnection,
       createdAt: now,
       updatedAt: now,
     })
@@ -111,6 +124,8 @@ async function insertInitialSettings(settings: AppSettings): Promise<void> {
         language: settings.language,
         openLastChat: settings.openLastChat,
         autoSelectCurrentPersona: settings.autoSelectCurrentPersona,
+        bindChatCompletionPresetToConnection:
+          settings.bindChatCompletionPresetToConnection,
         updatedAt: now,
       },
     });
@@ -148,6 +163,8 @@ export async function updateAppSettings(
       language: next.language,
       openLastChat: next.openLastChat,
       autoSelectCurrentPersona: next.autoSelectCurrentPersona,
+      bindChatCompletionPresetToConnection:
+        next.bindChatCompletionPresetToConnection,
       createdAt: now,
       updatedAt: now,
     })
@@ -157,6 +174,8 @@ export async function updateAppSettings(
         language: next.language,
         openLastChat: next.openLastChat,
         autoSelectCurrentPersona: next.autoSelectCurrentPersona,
+        bindChatCompletionPresetToConnection:
+          next.bindChatCompletionPresetToConnection,
         updatedAt: now,
       },
     });
diff --git a/shared/types/app-settings.ts b/shared/types/app-settings.ts
index 3cc35226..12b97d8e 100644
--- a/shared/types/app-settings.ts
+++ b/shared/types/app-settings.ts
@@ -2,6 +2,7 @@ export interface AppSettings {
   language: "ru" | "en";
   openLastChat: boolean;
   autoSelectCurrentPersona: boolean;
+  bindChatCompletionPresetToConnection: boolean;
 }
 
 export interface AppSettingsResponse {
diff --git a/shared/types/instructions.ts b/shared/types/instructions.ts
index da6c76ed..91ba7e1f 100644
--- a/shared/types/instructions.ts
+++ b/shared/types/instructions.ts
@@ -8,6 +8,7 @@ export type StPrompt = {
   role?: StPromptRole;
   content?: string;
   system_prompt?: boolean;
+  marker?: boolean;
 };
 
 export type StPromptOrderEntry = {
diff --git a/web/src/features/sidebars/instructions/index.tsx b/web/src/features/sidebars/instructions/index.tsx
index 89a56c9f..9dcaff63 100644
--- a/web/src/features/sidebars/instructions/index.tsx
+++ b/web/src/features/sidebars/instructions/index.tsx
@@ -1,26 +1,38 @@
-import { Group, Select, Stack } from '@mantine/core';
+import { Button, Group, Modal, Select, Stack, Text, TextInput } from '@mantine/core';
 import { useUnit } from 'effector-react';
-import { useRef } from 'react';
+import { useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuCopy, LuDownload, LuPlus, LuTrash2, LuUpload } from 'react-icons/lu';
+import {
+	LuDownload,
+	LuFilePlus2,
+	LuLink2,
+	LuLink2Off,
+	LuPencil,
+	LuSave,
+	LuTrash2,
+	LuUpload,
+} from 'react-icons/lu';
 
+import { getRuntime, patchRuntime } from '../../../api/llm';
+import { $appSettings, updateAppSettings } from '@model/app-settings';
 import {
+	$instructionEditorDraft,
 	$instructions,
 	$selectedInstructionId,
-	createInstructionRequested,
-	deleteInstructionRequested,
-	duplicateInstructionRequested,
-	importInstructionRequested,
+	createInstructionFx,
+	deleteInstructionFx,
 	instructionSelected,
+	updateInstructionFx,
 } from '@model/instructions';
 import {
 	buildStPresetFromAdvanced,
+	createBestEffortLlmBindingPlan,
 	createStAdvancedConfigFromPreset,
+	createTsInstructionMeta,
 	detectStChatCompletionPreset,
 	deriveInstructionTemplateText,
 	getTsInstructionMeta,
 	hasSensitivePresetFields,
-	withTsInstructionMeta,
 } from '@model/instructions/st-preset';
 import { Drawer } from '@ui/drawer';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
@@ -28,8 +40,22 @@ import { toaster } from '@ui/toaster';
 
 import { InstructionEditor } from './instruction-editor';
 
+import type { InstructionDto } from '../../../api/instructions';
 import type { InstructionMeta } from '@shared/types/instructions';
 
+type NameDialogMode = 'rename' | 'saveAs';
+
+type NameDialogState = {
+	mode: NameDialogMode;
+	value: string;
+	title: string;
+	submitLabel: string;
+};
+
+type PendingSensitiveImport = {
+	fileName: string;
+	json: Record<string, unknown>;
+};
 
 function downloadJson(params: { fileName: string; data: unknown }): void {
 	const blob = new Blob([JSON.stringify(params.data, null, 2)], { type: 'application/json' });
@@ -53,50 +79,272 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
+function createInstructionPayloadFromDraft(params: {
+	name: string;
+	templateText: string;
+	meta?: InstructionMeta;
+}) {
+	return {
+		name: params.name.trim(),
+		templateText: params.templateText,
+		meta: params.meta,
+	};
+}
+
+function resolveCopyName(originalName: string, usedNames: Set<string>): string {
+	const firstCopy = `${originalName} (copy)`;
+	if (!usedNames.has(firstCopy)) return firstCopy;
+	let index = 2;
+	while (usedNames.has(`${originalName} (copy ${index})`)) {
+		index += 1;
+	}
+	return `${originalName} (copy ${index})`;
+}
+
+function resolveUniqueName(name: string, usedNames: Set<string>): string {
+	const trimmed = name.trim();
+	if (!usedNames.has(trimmed)) return trimmed;
+	return resolveCopyName(trimmed, usedNames);
+}
+
+function areInstructionValuesEqual(
+	selectedInstruction: InstructionDto | null,
+	draft: { sourceInstructionId: string; name: string; templateText: string; meta?: InstructionMeta } | null,
+): boolean {
+	if (!selectedInstruction || !draft) return true;
+	if (draft.sourceInstructionId !== selectedInstruction.id) return false;
+	return (
+		draft.name === selectedInstruction.name &&
+		draft.templateText === selectedInstruction.templateText &&
+		JSON.stringify(draft.meta ?? null) === JSON.stringify(selectedInstruction.meta ?? null)
+	);
+}
+
 export const InstructionsSidebar = () => {
 	const { t } = useTranslation();
 	const fileInputRef = useRef<HTMLInputElement>(null);
-	const [items, selectedId] = useUnit([$instructions, $selectedInstructionId]);
-	const onImport = useUnit(importInstructionRequested);
+	const [items, selectedId, draft, appSettings, onCreateInstruction, onUpdateInstruction, onDeleteInstruction] = useUnit([
+		$instructions,
+		$selectedInstructionId,
+		$instructionEditorDraft,
+		$appSettings,
+		createInstructionFx,
+		updateInstructionFx,
+		deleteInstructionFx,
+	]);
 
+	const [nameDialog, setNameDialog] = useState<NameDialogState | null>(null);
+	const [deleteOpened, setDeleteOpened] = useState(false);
+	const [discardOpened, setDiscardOpened] = useState(false);
+	const [pendingSelectionId, setPendingSelectionId] = useState<string | null>(null);
+	const [pendingSensitiveImport, setPendingSensitiveImport] = useState<PendingSensitiveImport | null>(null);
+
+	const selectedInstruction = items.find((item) => item.id === selectedId) ?? null;
+	const selectedValue = selectedInstruction?.id ?? null;
+	const usedNames = useMemo(() => new Set(items.map((item) => item.name)), [items]);
 	const options = items
 		.filter((item) => typeof item.id === 'string' && item.id.trim().length > 0)
 		.map((item) => ({ value: item.id, label: item.name || item.id }));
-	const selectedInstruction = items.find((item) => item.id === selectedId) ?? null;
-	const selectedValue = options.some((item) => item.value === selectedId) ? selectedId : null;
 
-	const doExport = () => {
-		if (!selectedInstruction) {
-			toaster.error({ title: t('instructions.toasts.exportNotPossibleTitle'), description: t('instructions.toasts.selectForExport') });
-			return;
+	const currentValues = useMemo(() => {
+		if (draft && selectedInstruction && draft.sourceInstructionId === selectedInstruction.id) {
+			return {
+				name: draft.name,
+				templateText: draft.templateText,
+				meta: draft.meta,
+			};
 		}
 
-		const tsInstruction = getTsInstructionMeta(selectedInstruction.meta);
+		if (selectedInstruction) {
+			return {
+				name: selectedInstruction.name,
+				templateText: selectedInstruction.templateText,
+				meta: selectedInstruction.meta ?? undefined,
+			};
+		}
+
+		return null;
+	}, [draft, selectedInstruction]);
+
+	const hasUnsavedChanges = useMemo(
+		() => !areInstructionValuesEqual(selectedInstruction, draft),
+		[selectedInstruction, draft],
+	);
+
+	const selectedTsInstruction = getTsInstructionMeta(currentValues?.meta);
+	const selectedStAdvanced =
+		selectedTsInstruction?.mode === 'st_advanced' ? selectedTsInstruction.stAdvanced : null;
+
+	const applyBestEffortBinding = async (instruction: InstructionDto) => {
+		if (!appSettings.bindChatCompletionPresetToConnection) return;
+
+		const tsInstruction = getTsInstructionMeta(instruction.meta);
 		const stAdvanced = tsInstruction?.mode === 'st_advanced' ? tsInstruction.stAdvanced : null;
-		const exportStCompatible = Boolean(stAdvanced) && window.confirm(t('instructions.confirm.exportStPreset'));
+		if (!stAdvanced) return;
+
+		const plan = createBestEffortLlmBindingPlan(stAdvanced);
+		try {
+			if (plan.runtimePatch?.activeProviderId || typeof plan.runtimePatch?.activeModel !== 'undefined') {
+				const currentRuntime = await getRuntime({ scope: 'global', scopeId: 'global' });
+				await patchRuntime({
+					scope: 'global',
+					scopeId: 'global',
+					activeProviderId: plan.runtimePatch.activeProviderId ?? currentRuntime.activeProviderId,
+					activeTokenId: currentRuntime.activeTokenId,
+					activeModel:
+						typeof plan.runtimePatch.activeModel === 'undefined'
+							? currentRuntime.activeModel
+							: plan.runtimePatch.activeModel,
+				});
+			}
+		} catch (error) {
+			toaster.warning({
+				title: t('instructions.toasts.bindWarningTitle'),
+				description: error instanceof Error ? error.message : String(error),
+			});
+		}
 
-		if (exportStCompatible && stAdvanced) {
-			const preset = buildStPresetFromAdvanced(stAdvanced);
-			downloadJson({
-				fileName: `${selectedInstruction.name}.json`,
-				data: preset,
+		if (plan.warnings.length > 0) {
+			toaster.warning({
+				title: t('instructions.toasts.bindWarningTitle'),
+				description: plan.warnings.join(' '),
 			});
+		}
+	};
+
+	const applySelection = async (nextId: string) => {
+		instructionSelected(nextId);
+		const nextInstruction = items.find((item) => item.id === nextId);
+		if (nextInstruction) {
+			await applyBestEffortBinding(nextInstruction);
+		}
+	};
+
+	const promptForRename = () => {
+		if (!currentValues) return;
+		setNameDialog({
+			mode: 'rename',
+			value: currentValues.name,
+			title: t('instructions.dialogs.renameTitle'),
+			submitLabel: t('instructions.actions.rename'),
+		});
+	};
+
+	const promptForSaveAs = () => {
+		const fallbackName = currentValues?.name?.trim() ? `${currentValues.name} copy` : t('instructions.defaults.newPreset');
+		setNameDialog({
+			mode: 'saveAs',
+			value: fallbackName,
+			title: t('instructions.dialogs.saveAsTitle'),
+			submitLabel: t('instructions.actions.saveAs'),
+		});
+	};
+
+	const handleNameDialogSubmit = async () => {
+		if (!nameDialog || !currentValues || !selectedInstruction) return;
+		const nextName = nameDialog.value.trim();
+		if (!nextName) return;
+		const resolvedName =
+			nameDialog.mode === 'rename'
+				? nextName
+				: resolveUniqueName(nextName, usedNames);
+
+		try {
+			if (nameDialog.mode === 'rename') {
+				await onUpdateInstruction({
+					id: selectedInstruction.id,
+					...createInstructionPayloadFromDraft({
+						name: resolvedName,
+						templateText: currentValues.templateText,
+						meta: currentValues.meta,
+					}),
+				});
+				toaster.success({ title: t('instructions.toasts.savedTitle'), description: resolvedName });
+			} else {
+				const created = await onCreateInstruction(
+					createInstructionPayloadFromDraft({
+						name: resolvedName,
+						templateText: currentValues.templateText,
+						meta: currentValues.meta,
+					}),
+				);
+				await applyBestEffortBinding(created);
+				toaster.success({ title: t('instructions.toasts.createdTitle'), description: created.name });
+			}
+			setNameDialog(null);
+		} catch {
+			// global effect watchers already show the error toast
+		}
+	};
+
+	const handleUpdateCurrent = async () => {
+		if (!currentValues || !selectedInstruction) return;
+		try {
+			await onUpdateInstruction({
+				id: selectedInstruction.id,
+				...createInstructionPayloadFromDraft(currentValues),
+			});
+			toaster.success({ title: t('instructions.toasts.savedTitle'), description: currentValues.name });
+		} catch {
+			// handled by model watcher
+		}
+	};
+
+	const handleDelete = async () => {
+		if (!selectedInstruction) return;
+		try {
+			await onDeleteInstruction({ id: selectedInstruction.id });
+			setDeleteOpened(false);
+		} catch {
+			// handled by model watcher
+		}
+	};
+
+	const handleExport = () => {
+		if (!currentValues) {
+			toaster.error({ title: t('instructions.toasts.exportNotPossibleTitle'), description: t('instructions.toasts.selectForExport') });
+			return;
+		}
+
+		const tsInstruction = getTsInstructionMeta(currentValues.meta);
+		const stAdvanced = tsInstruction?.mode === 'st_advanced' ? tsInstruction.stAdvanced : null;
+		if (!stAdvanced) {
+			toaster.error({ title: t('instructions.toasts.exportNotPossibleTitle'), description: t('instructions.toasts.stPresetOnlyExport') });
 			return;
 		}
 
 		downloadJson({
-			fileName: `instruction-${selectedInstruction.name}.json`,
-			data: {
-				type: 'talespinner.instruction',
-				version: 1,
-				instruction: {
-					name: selectedInstruction.name,
-					engine: selectedInstruction.engine,
-					templateText: selectedInstruction.templateText,
-					meta: selectedInstruction.meta ?? null,
-				},
-			},
+			fileName: `${currentValues.name}.json`,
+			data: buildStPresetFromAdvanced(stAdvanced),
+		});
+	};
+
+	const importStPreset = (fileName: string, json: Record<string, unknown>, sensitiveImportMode: 'remove' | 'keep') => {
+		const stAdvanced = createStAdvancedConfigFromPreset({
+			preset: json,
+			fileName,
+			sensitiveImportMode,
 		});
+		const templateText = deriveInstructionTemplateText(stAdvanced);
+		void onCreateInstruction({
+			name: resolveUniqueName(
+				getBasename(fileName).trim() || t('instructions.defaults.importedInstruction'),
+				usedNames,
+			),
+			templateText,
+			meta: createTsInstructionMeta({
+				meta: null,
+				mode: 'st_advanced',
+				stAdvanced,
+			}),
+		})
+			.then((created) => {
+				void applyBestEffortBinding(created);
+				toaster.success({ title: t('instructions.toasts.importSuccessTitle'), description: created.name });
+			})
+			.catch(() => {
+				// handled by model watcher
+			});
 	};
 
 	const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -108,7 +356,6 @@ export const InstructionsSidebar = () => {
 			try {
 				const content = String(readEvent.target?.result ?? '');
 				const json = JSON.parse(content) as unknown;
-				const fileName = getBasename(file.name).trim() || t('instructions.defaults.importedInstruction');
 
 				if (
 					isRecord(json) &&
@@ -117,10 +364,7 @@ export const InstructionsSidebar = () => {
 				) {
 					const name = typeof json.instruction.name === 'string' ? json.instruction.name : t('instructions.defaults.importedInstruction');
 					const templateText = typeof json.instruction.templateText === 'string' ? json.instruction.templateText : '';
-					const meta =
-						isRecord(json.instruction.meta)
-							? (json.instruction.meta as InstructionMeta)
-							: undefined;
+					const meta = isRecord(json.instruction.meta) ? (json.instruction.meta as InstructionMeta) : undefined;
 
 					if (!templateText.trim()) {
 						toaster.error({
@@ -130,44 +374,21 @@ export const InstructionsSidebar = () => {
 						return;
 					}
 
-					onImport({ name, templateText, meta });
-					toaster.success({ title: t('instructions.toasts.importSuccessTitle'), description: name });
+					void onCreateInstruction({ name, templateText, meta })
+						.then((created) => toaster.success({ title: t('instructions.toasts.importSuccessTitle'), description: created.name }))
+						.catch(() => {
+							// handled by model watcher
+						});
 					return;
 				}
 
 				if (detectStChatCompletionPreset(json)) {
-					let sensitiveImportMode: 'remove' | 'keep' = 'keep';
 					if (hasSensitivePresetFields(json)) {
-						const removeSensitive = window.confirm(t('instructions.confirm.sensitiveRemove'));
-						if (removeSensitive) {
-							sensitiveImportMode = 'remove';
-						} else {
-							const importAsIs = window.confirm(t('instructions.confirm.sensitiveImportAsIs'));
-							if (!importAsIs) return;
-						}
+						setPendingSensitiveImport({ fileName: file.name, json });
+						return;
 					}
 
-					const stAdvanced = createStAdvancedConfigFromPreset({
-						preset: json,
-						fileName: file.name,
-						sensitiveImportMode,
-					});
-					const templateText = deriveInstructionTemplateText(stAdvanced);
-					const meta = withTsInstructionMeta({
-						meta: null,
-						tsInstruction: {
-							version: 1,
-							mode: 'st_advanced',
-							stAdvanced,
-						},
-					});
-
-					onImport({
-						name: fileName,
-						templateText,
-						meta,
-					});
-					toaster.success({ title: t('instructions.toasts.importSuccessTitle'), description: fileName });
+					importStPreset(file.name, json, 'keep');
 					return;
 				}
 
@@ -190,66 +411,215 @@ export const InstructionsSidebar = () => {
 	return (
 		<Drawer name="instructions" title={t('instructions.title')}>
 			<Stack gap="md">
-				<input type="file" ref={fileInputRef} style={{ display: 'none' }} accept=".json" onChange={handleFileChange} />
-
-				<Group gap="sm" wrap="nowrap" className="ts-sidebar-toolbar">
-					<Select
-						data={options}
-						value={selectedValue}
-						onChange={(id) => {
-							if (!id) return;
-							instructionSelected(id);
-						}}
-						placeholder={t('instructions.placeholders.selectInstruction')}
-						comboboxProps={{ withinPortal: false }}
-						className="ts-sidebar-toolbar__main"
-					/>
-
-					<Group gap="xs" wrap="nowrap" className="ts-sidebar-toolbar__actions">
-						<IconButtonWithTooltip
-							tooltip={t('common.create')}
-							icon={<LuPlus />}
-							aria-label={t('common.create')}
-							onClick={() => createInstructionRequested()}
-						/>
-						<IconButtonWithTooltip
-							tooltip={t('common.duplicate')}
-							icon={<LuCopy />}
-							aria-label={t('common.duplicate')}
-							disabled={!selectedId}
-							onClick={() => {
-								if (!selectedId) return;
-								duplicateInstructionRequested({ id: selectedId });
-							}}
-						/>
-						<IconButtonWithTooltip
-							tooltip={t('common.import')}
-							icon={<LuUpload />}
-							aria-label={t('common.import')}
-							onClick={() => fileInputRef.current?.click()}
-						/>
-						<IconButtonWithTooltip
-							tooltip={t('common.export')}
-							icon={<LuDownload />}
-							aria-label={t('common.export')}
-							disabled={!selectedId}
-							onClick={doExport}
+				<input type="file" ref={fileInputRef} style={{ display: 'none' }} accept=".json,.settings" onChange={handleFileChange} />
+
+				<Modal
+					opened={nameDialog !== null}
+					onClose={() => setNameDialog(null)}
+					title={nameDialog?.title ?? ''}
+					centered
+				>
+					<Stack gap="md">
+						<TextInput
+							label={t('instructions.fields.name')}
+							value={nameDialog?.value ?? ''}
+							onChange={(event) =>
+								setNameDialog((current) =>
+									current ? { ...current, value: event.currentTarget.value } : current,
+								)
+							}
+							placeholder={t('instructions.placeholders.name')}
+							autoFocus
 						/>
-						<IconButtonWithTooltip
-							tooltip={t('common.delete')}
-							icon={<LuTrash2 />}
-							aria-label={t('common.delete')}
-							color="red"
-							variant="outline"
-							disabled={!selectedId}
-							onClick={() => {
-								if (!selectedId) return;
-								if (!window.confirm(t('instructions.confirm.deleteInstruction'))) return;
-								deleteInstructionRequested({ id: selectedId });
+						<Group justify="flex-end">
+							<Button variant="default" onClick={() => setNameDialog(null)}>
+								{t('common.cancel')}
+							</Button>
+							<Button onClick={() => void handleNameDialogSubmit()}>{nameDialog?.submitLabel}</Button>
+						</Group>
+					</Stack>
+				</Modal>
+
+				<Modal opened={deleteOpened} onClose={() => setDeleteOpened(false)} title={t('instructions.dialogs.deleteTitle')} centered>
+					<Stack gap="md">
+						<Text>{t('instructions.confirm.deleteInstruction')}</Text>
+						<Group justify="flex-end">
+							<Button variant="default" onClick={() => setDeleteOpened(false)}>
+								{t('common.cancel')}
+							</Button>
+							<Button color="red" onClick={() => void handleDelete()}>
+								{t('common.delete')}
+							</Button>
+						</Group>
+					</Stack>
+				</Modal>
+
+				<Modal
+					opened={discardOpened}
+					onClose={() => {
+						setDiscardOpened(false);
+						setPendingSelectionId(null);
+					}}
+					title={t('instructions.dialogs.discardTitle')}
+					centered
+				>
+					<Stack gap="md">
+						<Text>{t('instructions.confirm.discardChanges')}</Text>
+						<Group justify="flex-end">
+							<Button
+								variant="default"
+								onClick={() => {
+									setDiscardOpened(false);
+									setPendingSelectionId(null);
+								}}
+							>
+								{t('common.cancel')}
+							</Button>
+							<Button
+								color="yellow"
+								onClick={() => {
+									const nextId = pendingSelectionId;
+									setDiscardOpened(false);
+									setPendingSelectionId(null);
+									if (nextId) void applySelection(nextId);
+								}}
+							>
+								{t('instructions.actions.discardAndSwitch')}
+							</Button>
+						</Group>
+					</Stack>
+				</Modal>
+
+				<Modal
+					opened={pendingSensitiveImport !== null}
+					onClose={() => setPendingSensitiveImport(null)}
+					title={t('instructions.dialogs.sensitiveImportTitle')}
+					centered
+				>
+					<Stack gap="md">
+						<Text>{t('instructions.confirm.sensitiveImportChoice')}</Text>
+						<Group justify="flex-end">
+							<Button variant="default" onClick={() => setPendingSensitiveImport(null)}>
+								{t('common.cancel')}
+							</Button>
+							<Button
+								variant="default"
+								onClick={() => {
+									if (!pendingSensitiveImport) return;
+									importStPreset(pendingSensitiveImport.fileName, pendingSensitiveImport.json, 'remove');
+									setPendingSensitiveImport(null);
+								}}
+							>
+								{t('instructions.actions.importWithoutSensitive')}
+							</Button>
+							<Button
+								onClick={() => {
+									if (!pendingSensitiveImport) return;
+									importStPreset(pendingSensitiveImport.fileName, pendingSensitiveImport.json, 'keep');
+									setPendingSensitiveImport(null);
+								}}
+							>
+								{t('instructions.actions.importAsIs')}
+							</Button>
+						</Group>
+					</Stack>
+				</Modal>
+
+				<Stack gap="xs">
+					<Group justify="space-between" wrap="nowrap">
+						<Text fw={700}>{t('instructions.presets.title')}</Text>
+						<Group gap="xs" wrap="nowrap">
+							<IconButtonWithTooltip
+								tooltip={
+									appSettings.bindChatCompletionPresetToConnection
+										? t('instructions.presets.actions.unbind')
+										: t('instructions.presets.actions.bind')
+								}
+								icon={
+									appSettings.bindChatCompletionPresetToConnection ? (
+										<LuLink2 size={16} />
+									) : (
+										<LuLink2Off size={16} />
+									)
+								}
+								aria-label={t('instructions.presets.actions.bind')}
+								variant={appSettings.bindChatCompletionPresetToConnection ? 'solid' : 'subtle'}
+								onClick={() =>
+									updateAppSettings({
+										bindChatCompletionPresetToConnection: !appSettings.bindChatCompletionPresetToConnection,
+									})
+								}
+							/>
+							<IconButtonWithTooltip
+								tooltip={t('instructions.presets.actions.import')}
+								icon={<LuUpload size={16} />}
+								aria-label={t('instructions.presets.actions.import')}
+								onClick={() => fileInputRef.current?.click()}
+							/>
+							<IconButtonWithTooltip
+								tooltip={t('instructions.presets.actions.export')}
+								icon={<LuDownload size={16} />}
+								aria-label={t('instructions.presets.actions.export')}
+								disabled={!selectedStAdvanced}
+								onClick={handleExport}
+							/>
+							<IconButtonWithTooltip
+								tooltip={t('instructions.presets.actions.delete')}
+								icon={<LuTrash2 size={16} />}
+								aria-label={t('instructions.presets.actions.delete')}
+								color="red"
+								variant="outline"
+								disabled={!selectedInstruction}
+								onClick={() => setDeleteOpened(true)}
+							/>
+						</Group>
+					</Group>
+
+					<Group gap="sm" wrap="nowrap" align="flex-end">
+						<Select
+							data={options}
+							value={selectedValue}
+							onChange={(id) => {
+								if (!id || id === selectedValue) return;
+								if (hasUnsavedChanges) {
+									setPendingSelectionId(id);
+									setDiscardOpened(true);
+									return;
+								}
+								void applySelection(id);
 							}}
+							placeholder={t('instructions.placeholders.selectInstruction')}
+							comboboxProps={{ withinPortal: false }}
+							className="ts-sidebar-toolbar__main"
+							style={{ flex: 1 }}
 						/>
+
+						<Group gap="xs" wrap="nowrap">
+							<IconButtonWithTooltip
+								tooltip={t('instructions.actions.updateCurrent')}
+								icon={<LuSave size={16} />}
+								aria-label={t('instructions.actions.updateCurrent')}
+								variant="solid"
+								disabled={!selectedInstruction || !hasUnsavedChanges}
+								onClick={() => void handleUpdateCurrent()}
+							/>
+							<IconButtonWithTooltip
+								tooltip={t('instructions.actions.rename')}
+								icon={<LuPencil size={16} />}
+								aria-label={t('instructions.actions.rename')}
+								disabled={!selectedInstruction}
+								onClick={promptForRename}
+							/>
+							<IconButtonWithTooltip
+								tooltip={t('instructions.actions.saveAs')}
+								icon={<LuFilePlus2 size={16} />}
+								aria-label={t('instructions.actions.saveAs')}
+								disabled={!currentValues}
+								onClick={promptForSaveAs}
+							/>
+						</Group>
 					</Group>
-				</Group>
+				</Stack>
 
 				<InstructionEditor />
 			</Stack>
diff --git a/web/src/features/sidebars/instructions/instruction-editor.tsx b/web/src/features/sidebars/instructions/instruction-editor.tsx
index 462647c1..6745fc9b 100644
--- a/web/src/features/sidebars/instructions/instruction-editor.tsx
+++ b/web/src/features/sidebars/instructions/instruction-editor.tsx
@@ -1,21 +1,23 @@
-import { Badge, Button, Checkbox, Group, NumberInput, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
+import { Accordion, Alert, Badge, Button, Collapse, Group, NumberInput, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
 import { useUnit } from 'effector-react';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { LuArrowDown, LuArrowUp, LuPlus, LuTrash2 } from 'react-icons/lu';
+import { LuArrowDown, LuArrowUp, LuChevronDown, LuChevronRight, LuPlus, LuTrash2 } from 'react-icons/lu';
 
 import { $currentBranchId, $currentChat, $currentEntityProfile } from '@model/chat-core';
 import {
 	$selectedInstruction,
-	updateInstructionRequested,
+	instructionEditorDraftChanged,
 } from '@model/instructions';
 import {
+	createTsInstructionMeta,
+	getStPromptDefinition,
+	getStPromptSourceLabel,
 	getTsInstructionMeta,
+	isSystemMarkerPrompt,
 	resolvePreferredPromptOrder,
-	withTsInstructionMeta,
 } from '@model/instructions/st-preset';
-import { FormInput } from '@ui/form-components';
 import { LiquidDocsButton } from '@ui/liquid-template-docs';
 
 import { prerenderInstruction } from '../../../api/instructions';
@@ -74,6 +76,8 @@ function createDefaultAdvancedConfig(templateText: string): StAdvancedConfig {
 
 function normalizePromptForEdit(prompt: StPrompt | undefined, identifier: string): StPrompt {
 	if (prompt) return { ...prompt };
+	const definition = getStPromptDefinition(identifier);
+	if (definition) return { ...definition };
 	return {
 		identifier,
 		name: identifier,
@@ -90,6 +94,7 @@ export const InstructionEditor = () => {
 	const [isAdvancedMode, setIsAdvancedMode] = useState(false);
 	const [stAdvanced, setStAdvanced] = useState<StAdvancedConfig | null>(null);
 	const [newPromptIdentifier, setNewPromptIdentifier] = useState<string | null>(null);
+	const [collapsedPromptById, setCollapsedPromptById] = useState<Record<string, boolean>>({});
 
 	const [preview, setPreview] = useState<string>('');
 	const [previewError, setPreviewError] = useState<string | null>(null);
@@ -102,6 +107,8 @@ export const InstructionEditor = () => {
 		},
 	});
 	const { reset } = methods;
+	const watchedName = methods.watch('name');
+	const watchedTemplateText = methods.watch('templateText');
 	const lastResetInstructionIdRef = useRef<string | null>(null);
 
 	useEffect(() => {
@@ -125,10 +132,29 @@ export const InstructionEditor = () => {
 		setIsAdvancedMode(mode === 'st_advanced');
 		setStAdvanced(advancedConfig);
 		setNewPromptIdentifier(null);
+		setCollapsedPromptById({});
 		setPreview('');
 		setPreviewError(null);
 	}, [reset, tpl?.id, tpl?.meta, tpl?.name, tpl?.templateText]);
 
+	useEffect(() => {
+		if (!tpl) {
+			instructionEditorDraftChanged(null);
+			return;
+		}
+		const ensuredAdvanced = stAdvanced ?? createDefaultAdvancedConfig(watchedTemplateText);
+		instructionEditorDraftChanged({
+			sourceInstructionId: tpl.id,
+			name: watchedName,
+			templateText: watchedTemplateText,
+			meta: createTsInstructionMeta({
+				meta: tpl.meta,
+				mode: isAdvancedMode ? 'st_advanced' : 'basic',
+				stAdvanced: ensuredAdvanced,
+			}),
+		});
+	}, [isAdvancedMode, stAdvanced, tpl, watchedName, watchedTemplateText]);
+
 	const preferredOrder = useMemo(() => {
 		if (!stAdvanced) return null;
 		return resolvePreferredPromptOrder(stAdvanced);
@@ -158,6 +184,19 @@ export const InstructionEditor = () => {
 
 	if (!tpl) return null;
 
+	const isPromptCollapsed = (identifier: string, isMarkerPrompt: boolean): boolean => {
+		const value = collapsedPromptById[identifier];
+		if (typeof value === 'boolean') return value;
+		return isMarkerPrompt;
+	};
+
+	const togglePromptCollapsed = (identifier: string, isMarkerPrompt: boolean) => {
+		setCollapsedPromptById((current) => ({
+			...current,
+			[identifier]: !isPromptCollapsed(identifier, isMarkerPrompt),
+		}));
+	};
+
 	const updatePreferredOrder = (updater: (order: Array<{ identifier: string; enabled: boolean }>) => Array<{ identifier: string; enabled: boolean }>) => {
 		setStAdvanced((current) => {
 			if (!current) return current;
@@ -270,23 +309,6 @@ export const InstructionEditor = () => {
 		});
 	};
 
-	const onSubmit = (data: FormValues) => {
-		const ensuredAdvanced = stAdvanced ?? createDefaultAdvancedConfig(data.templateText);
-		updateInstructionRequested({
-			id: tpl.id,
-			name: data.name,
-			templateText: data.templateText,
-			meta: withTsInstructionMeta({
-				meta: tpl.meta,
-				tsInstruction: {
-					version: 1,
-					mode: isAdvancedMode ? 'st_advanced' : 'basic',
-					stAdvanced: ensuredAdvanced,
-				},
-			}),
-		});
-	};
-
 	const onPrerender = async () => {
 		setPreviewLoading(true);
 		setPreviewError(null);
@@ -310,8 +332,6 @@ export const InstructionEditor = () => {
 	return (
 		<FormProvider {...methods}>
 			<Stack gap="md" mt="md">
-				<FormInput name="name" label={t('instructions.fields.name')} placeholder={t('instructions.placeholders.name')} />
-
 				<Switch
 					label={t('instructions.fields.advancedMode')}
 					checked={isAdvancedMode}
@@ -328,7 +348,7 @@ export const InstructionEditor = () => {
 								</Group>
 							}
 							description={t('instructions.fields.templateTextDescription')}
-							value={methods.watch('templateText')}
+							value={watchedTemplateText}
 							onChange={(e) => methods.setValue('templateText', e.currentTarget.value, { shouldDirty: true })}
 							minRows={14}
 							autosize
@@ -360,7 +380,7 @@ export const InstructionEditor = () => {
 						<Text fw={600}>{t('instructions.fields.fallbackTemplateText')}</Text>
 						<Textarea
 							description={t('instructions.fields.fallbackTemplateTextDescription')}
-							value={methods.watch('templateText')}
+							value={watchedTemplateText}
 							onChange={(e) => methods.setValue('templateText', e.currentTarget.value, { shouldDirty: true })}
 							minRows={5}
 							autosize
@@ -397,11 +417,12 @@ export const InstructionEditor = () => {
 											if (current.prompts.some((item) => item.identifier === newPromptIdentifier)) {
 												return current;
 											}
+											const definition = getStPromptDefinition(newPromptIdentifier);
 											return {
 												...current,
 												prompts: [
 													...current.prompts,
-													{
+													definition ?? {
 														identifier: newPromptIdentifier,
 														name: newPromptIdentifier,
 														role: 'system',
@@ -422,12 +443,24 @@ export const InstructionEditor = () => {
 						{preferredOrder.order.map((entry, index) => {
 							const prompt = normalizePromptForEdit(promptMap.get(entry.identifier), entry.identifier);
 							const unsupported = !KNOWN_PROMPT_IDENTIFIERS.includes(entry.identifier);
+							const isMarkerPrompt = isSystemMarkerPrompt(prompt);
+							const sourceLabel = getStPromptSourceLabel(entry.identifier);
+							const isCollapsed = isPromptCollapsed(entry.identifier, isMarkerPrompt);
 
 							return (
 								<Stack key={`${entry.identifier}_${index}`} gap={6} p="xs" style={{ border: '1px solid var(--mantine-color-gray-3)', borderRadius: 8 }}>
 									<Group justify="space-between" align="center">
 										<Group gap="xs" align="center">
-											<Checkbox
+											<Button
+												size="compact-sm"
+												variant="subtle"
+												px={4}
+												onClick={() => togglePromptCollapsed(entry.identifier, isMarkerPrompt)}
+												aria-label={isCollapsed ? 'Expand block' : 'Collapse block'}
+											>
+												{isCollapsed ? <LuChevronRight size={16} /> : <LuChevronDown size={16} />}
+											</Button>
+											<Switch
 												checked={entry.enabled}
 												onChange={(event) => {
 													const enabled = event.currentTarget.checked;
@@ -438,6 +471,7 @@ export const InstructionEditor = () => {
 													);
 												}}
 												label={entry.identifier}
+												size="sm"
 											/>
 											{unsupported && <Badge color="orange" variant="light">{t('instructions.fields.unsupportedBlock')}</Badge>}
 										</Group>
@@ -479,6 +513,7 @@ export const InstructionEditor = () => {
 												variant="subtle"
 												color="red"
 												leftSection={<LuTrash2 size={14} />}
+												disabled={isMarkerPrompt}
 												onClick={() => {
 													updatePreferredOrder((order) => order.filter((_, itemIndex) => itemIndex !== index));
 												}}
@@ -488,14 +523,31 @@ export const InstructionEditor = () => {
 										</Group>
 									</Group>
 
-									<Textarea
-										value={prompt.content ?? ''}
-										onChange={(event) => setPromptContent(entry.identifier, event.currentTarget.value)}
-										placeholder={t('instructions.placeholders.promptBlockContent')}
-										minRows={4}
-										autosize
-										styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
-									/>
+									<Collapse in={!isCollapsed}>
+										<Stack gap={6}>
+											{isMarkerPrompt ? (
+												<Alert color="blue" variant="light" title={t('instructions.fields.systemBlockTitle')}>
+													<Stack gap={4}>
+														<Text size="sm">{t('instructions.fields.systemBlockDescription')}</Text>
+														{sourceLabel ? (
+															<Text size="sm">
+																{t('instructions.fields.systemBlockSource')}: {sourceLabel}
+															</Text>
+														) : null}
+													</Stack>
+												</Alert>
+											) : (
+												<Textarea
+													value={prompt.content ?? ''}
+													onChange={(event) => setPromptContent(entry.identifier, event.currentTarget.value)}
+													placeholder={t('instructions.placeholders.promptBlockContent')}
+													minRows={4}
+													autosize
+													styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
+												/>
+											)}
+										</Stack>
+									</Collapse>
 								</Stack>
 							);
 						})}
@@ -624,14 +676,23 @@ export const InstructionEditor = () => {
 								readOnly
 							/>
 						</Group>
-						<Textarea
-							label={t('instructions.fields.rawPreset')}
-							value={rawPresetJson}
-							readOnly
-							minRows={6}
-							autosize
-							styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
-						/>
+						<Accordion variant="separated">
+							<Accordion.Item value="details">
+								<Accordion.Control>{t('instructions.fields.details')}</Accordion.Control>
+								<Accordion.Panel>
+									<Stack gap="sm">
+										<Textarea
+											label={t('instructions.fields.rawPreset')}
+											value={rawPresetJson}
+											readOnly
+											minRows={6}
+											autosize
+											styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
+										/>
+									</Stack>
+								</Accordion.Panel>
+							</Accordion.Item>
+						</Accordion>
 					</Stack>
 				)}
 
@@ -641,7 +702,6 @@ export const InstructionEditor = () => {
 							{t('instructions.actions.prerender')}
 						</Button>
 					)}
-					<Button onClick={methods.handleSubmit(onSubmit)}>{t('common.save')}</Button>
 				</Group>
 			</Stack>
 		</FormProvider>
diff --git a/web/src/i18n/resources/en/instructions.ts b/web/src/i18n/resources/en/instructions.ts
index 5d2e395b..42f1c9f3 100644
--- a/web/src/i18n/resources/en/instructions.ts
+++ b/web/src/i18n/resources/en/instructions.ts
@@ -1,56 +1,89 @@
-const enInstructions = {
-			title: 'Instructions',
-			actions: {
-				create: 'Create instruction',
-				duplicate: 'Duplicate instruction',
-				delete: 'Delete instruction',
-				prerender: 'Prerender',
-			},
-			fields: {
-				name: 'Name',
-				templateText: 'Template (LiquidJS)',
-				templateTextDescription: 'Syntax is validated on the backend when saving.',
-				advancedMode: 'Advanced mode (ST-compatible)',
-				fallbackTemplateText: 'Fallback templateText (basic compatibility)',
-				fallbackTemplateTextDescription: 'Used when instruction mode is switched back to basic.',
-				prerender: 'Prerender',
-				prerenderDescription: 'Liquid render result on backend (without LLM generation).',
-				promptBlocks: 'Prompt blocks',
-				unsupportedBlock: 'unsupported in runtime',
-				responseConfig: 'Response config',
-				importSource: 'Import source',
-				importFileName: 'Imported file',
-				importedAt: 'Imported at',
-				rawPreset: 'Raw ST preset (round-trip storage)',
-			},
-			placeholders: {
-				name: 'Enter name',
-				selectInstruction: 'Select instruction',
-				addPromptBlock: 'Add prompt block',
-				promptBlockContent: 'Prompt content',
-			},
-			defaults: {
-				newInstruction: 'New instruction',
-				importedInstruction: 'Imported instruction',
-			},
-			confirm: {
-				deleteInstruction: 'Delete instruction?',
-				exportStPreset: 'Export ST-compatible preset? (Cancel will export TaleSpinner format)',
-				sensitiveRemove: 'Sensitive connection fields were found. Remove them during import?',
-				sensitiveImportAsIs: 'Import sensitive fields as-is? (Cancel to abort import)',
-			},
-			toasts: {
-				exportNotPossibleTitle: 'Export not possible',
-				selectForExport: 'Select an instruction to export',
-				importErrorTitle: 'Import error',
-				importMissingTemplateText: 'File does not contain templateText',
-				importSuccessTitle: 'Import successful',
-				importReadError: 'Failed to read file',
-				createErrorTitle: 'Failed to create instruction',
-				saveErrorTitle: 'Failed to save instruction',
-				deleteErrorTitle: 'Failed to delete instruction',
-			},
-		};
+const enInstructions = {
+	title: 'Instructions',
+	presets: {
+		title: 'Chat Completion Presets',
+		bindLabel: 'Bind preset to connection',
+		actions: {
+			bind: 'Bind preset to connection',
+			unbind: 'Do not bind preset to connection',
+			import: 'Import preset',
+			export: 'Export preset',
+			delete: 'Delete preset',
+		},
+	},
+	actions: {
+		create: 'Create instruction',
+		duplicate: 'Duplicate instruction',
+		delete: 'Delete instruction',
+		prerender: 'Prerender',
+		rename: 'Rename',
+		saveAs: 'Save as new',
+		updateCurrent: 'Update current preset',
+		discardAndSwitch: 'Discard and switch',
+		importWithoutSensitive: 'Import without sensitive fields',
+		importAsIs: 'Import as-is',
+	},
+	fields: {
+		name: 'Name',
+		templateText: 'Template (LiquidJS)',
+		templateTextDescription: 'Syntax is validated on the backend when saving.',
+		advancedMode: 'Advanced mode (ST-compatible)',
+		fallbackTemplateText: 'Fallback templateText (basic compatibility)',
+		fallbackTemplateTextDescription: 'Used when instruction mode is switched back to basic.',
+		prerender: 'Prerender',
+		prerenderDescription: 'Liquid render result on backend (without LLM generation).',
+		promptBlocks: 'Prompt blocks',
+		unsupportedBlock: 'unsupported in runtime',
+		responseConfig: 'Response config',
+		importSource: 'Import source',
+		importFileName: 'Imported file',
+		importedAt: 'Imported at',
+		rawPreset: 'Raw ST preset (round-trip storage)',
+		details: 'ST preset details',
+		systemBlockTitle: 'System block',
+		systemBlockDescription:
+			'This block is filled automatically by the runtime and is not edited directly in the preset.',
+		systemBlockSource: 'Runtime source',
+	},
+	placeholders: {
+		name: 'Enter name',
+		selectInstruction: 'Select instruction',
+		addPromptBlock: 'Add prompt block',
+		promptBlockContent: 'Prompt content',
+	},
+	defaults: {
+		newInstruction: 'New instruction',
+		newPreset: 'New preset',
+		importedInstruction: 'Imported instruction',
+	},
+	confirm: {
+		deleteInstruction: 'Delete instruction?',
+		discardChanges: 'You have unsaved changes. Discard them and switch preset?',
+		sensitiveImportChoice:
+			'Sensitive connection fields were found. Choose whether to strip them during import or keep them for round-trip export.',
+	},
+	dialogs: {
+		renameTitle: 'Rename preset',
+		saveAsTitle: 'Save preset as',
+		deleteTitle: 'Delete preset',
+		discardTitle: 'Discard changes?',
+		sensitiveImportTitle: 'Sensitive import fields',
+	},
+	toasts: {
+		exportNotPossibleTitle: 'Export not possible',
+		selectForExport: 'Select an instruction to export',
+		stPresetOnlyExport: 'Only ST-compatible presets can be exported from this toolbar',
+		importErrorTitle: 'Import error',
+		importMissingTemplateText: 'File does not contain templateText',
+		importSuccessTitle: 'Import successful',
+		importReadError: 'Failed to read file',
+		createErrorTitle: 'Failed to create instruction',
+		saveErrorTitle: 'Failed to save instruction',
+		deleteErrorTitle: 'Failed to delete instruction',
+		createdTitle: 'Preset created',
+		savedTitle: 'Preset saved',
+		bindWarningTitle: 'Preset applied with warnings',
+	},
+};
 
 export default enInstructions;
-
diff --git a/web/src/i18n/resources/en/provider.ts b/web/src/i18n/resources/en/provider.ts
index b48ac0b8..275b33cf 100644
--- a/web/src/i18n/resources/en/provider.ts
+++ b/web/src/i18n/resources/en/provider.ts
@@ -1,92 +1,91 @@
-const enProvider = {
-			providerLabel: 'API provider',
-			placeholders: {
-				selectProvider: 'Select provider...',
-				selectToken: 'Select token...',
-				noTokens: 'No tokens',
-				selectModel: 'Select model...',
-				selectTokenFirst: 'Select a token first',
-			},
-			tokens: {
-				title: 'Tokens',
-				manage: 'Manage tokens',
-			},
-			config: {
-				title: 'Provider configuration',
-				baseUrl: 'Base URL',
-				defaultModel: 'Default model (optional)',
-				checkConnection: 'Check connection',
-				checkConnectionHelp:
-					'The check uses the selected token and the current config draft. You do not need to save settings first.',
-				connectionSuccessTitle: 'Provider connection is working',
-				connectionErrorTitle: 'Provider check failed',
-				checkedEndpoint: 'Checked endpoint',
-				tokenPolicy: {
-					title: 'Token policy',
-					randomize: 'Use random token when more than one token exists',
-					fallbackOnError: 'Fallback to next token on pre-stream errors',
-				},
-				messageNormalization: {
-					title: 'Message normalization',
-					enabled: 'Merge all system instructions into one message',
-					helpText: 'Enabled by default for compatibility with providers that accept only one system message.',
-				},
-				anthropicCache: {
-					title: 'Anthropic prompt cache',
-					enabled: 'Enable Anthropic/OpenRouter prompt cache',
-					depth: 'Cache depth (from tail)',
-					ttl: 'Cache TTL',
-					helpText: 'Depth is measured from the last message; the dynamic tail window stays uncached.',
-				},
-				save: 'Save config',
-			},
-			model: {
-				title: 'Model',
-				load: 'Load models',
-				manual: 'Manual model id',
-				manualPlaceholder: 'e.g. anthropic/claude-3.5-sonnet',
-				applyManual: 'Apply',
-				helpText: 'If no model is selected, provider `defaultModel` (if set) or provider default will be used.',
-			},
-			presets: {
-				title: 'LLM presets',
-				active: 'Active preset',
-				defaults: {
-					newPresetName: 'New LLM preset',
-				},
-				actions: {
-					createPrompt: 'Enter preset name',
-					renamePrompt: 'Enter new preset name',
-					create: 'Create',
-					save: 'Save',
-					rename: 'Rename',
-					duplicate: 'Duplicate',
-					delete: 'Delete',
-				},
-				confirm: {
-					delete: 'Delete selected preset?',
-					discardChanges: 'You have unsaved changes. Discard them and switch preset?',
-				},
-				toasts: {
-					created: 'Preset created',
-					saved: 'Preset saved',
-					deleted: 'Preset deleted',
-					applied: 'Preset applied',
-					appliedWithWarnings: 'Preset applied with warnings',
-					failed: 'Preset action failed',
-				},
-			},
-			toasts: {
-				configSaved: 'Provider config saved',
-				configSaveFailed: 'Failed to save provider config',
-				connectionCheckPassed: 'Provider check passed',
-				connectionCheckFailed: 'Provider check failed',
-				modelsEmpty: 'Models list is empty',
-				modelsEmptyHelp:
-					'The provider returned no models. Check Base URL, token, and use the connection check button.',
-				modelsLoadFailed: 'Failed to load models',
-			},
-		};
+const enProvider = {
+	providerLabel: 'API provider',
+	placeholders: {
+		selectProvider: 'Select provider...',
+		selectToken: 'Select token...',
+		noTokens: 'No tokens',
+		selectModel: 'Select model...',
+		selectTokenFirst: 'Select a token first',
+	},
+	tokens: {
+		title: 'Tokens',
+		manage: 'Manage tokens',
+	},
+	config: {
+		title: 'Provider configuration',
+		baseUrl: 'Base URL',
+		defaultModel: 'Default model (optional)',
+		checkConnection: 'Check connection',
+		checkConnectionHelp:
+			'The check uses the selected token and the current config draft. You do not need to save settings first.',
+		connectionSuccessTitle: 'Provider connection is working',
+		connectionErrorTitle: 'Provider check failed',
+		checkedEndpoint: 'Checked endpoint',
+		tokenPolicy: {
+			title: 'Token policy',
+			randomize: 'Use random token when more than one token exists',
+			fallbackOnError: 'Fallback to next token on pre-stream errors',
+		},
+		messageNormalization: {
+			title: 'Message normalization',
+			enabled: 'Merge all system instructions into one message',
+			helpText: 'Enabled by default for compatibility with providers that accept only one system message.',
+		},
+		anthropicCache: {
+			title: 'Anthropic prompt cache',
+			enabled: 'Enable Anthropic/OpenRouter prompt cache',
+			depth: 'Cache depth (from tail)',
+			ttl: 'Cache TTL',
+			helpText: 'Depth is measured from the last message; the dynamic tail window stays uncached.',
+		},
+		save: 'Save config',
+	},
+	model: {
+		title: 'Model',
+		load: 'Load models',
+		manual: 'Manual model id',
+		manualPlaceholder: 'e.g. anthropic/claude-3.5-sonnet',
+		applyManual: 'Apply',
+		helpText: 'If no model is selected, provider `defaultModel` (if set) or provider default will be used.',
+	},
+	presets: {
+		title: 'Connection presets',
+		active: 'Active preset',
+		defaults: {
+			newPresetName: 'New connection preset',
+		},
+		actions: {
+			createPrompt: 'Enter preset name',
+			renamePrompt: 'Enter new preset name',
+			create: 'Create',
+			save: 'Save',
+			rename: 'Rename',
+			duplicate: 'Duplicate',
+			delete: 'Delete',
+		},
+		confirm: {
+			delete: 'Delete selected preset?',
+			discardChanges: 'You have unsaved changes. Discard them and switch preset?',
+		},
+		toasts: {
+			created: 'Preset created',
+			saved: 'Preset saved',
+			deleted: 'Preset deleted',
+			applied: 'Preset applied',
+			appliedWithWarnings: 'Preset applied with warnings',
+			failed: 'Preset action failed',
+		},
+	},
+	toasts: {
+		configSaved: 'Provider config saved',
+		configSaveFailed: 'Failed to save provider config',
+		connectionCheckPassed: 'Provider check passed',
+		connectionCheckFailed: 'Provider check failed',
+		modelsEmpty: 'Models list is empty',
+		modelsEmptyHelp:
+			'The provider returned no models. Check Base URL, token, and use the connection check button.',
+		modelsLoadFailed: 'Failed to load models',
+	},
+};
 
 export default enProvider;
-
diff --git a/web/src/i18n/resources/ru/instructions.ts b/web/src/i18n/resources/ru/instructions.ts
index c5c20400..251bb76d 100644
--- a/web/src/i18n/resources/ru/instructions.ts
+++ b/web/src/i18n/resources/ru/instructions.ts
@@ -1,56 +1,89 @@
-const ruInstructions = {
-			title: 'Инструкции',
-			actions: {
-				create: 'Создать инструкцию',
-				duplicate: 'Дублировать инструкцию',
-				delete: 'Удалить инструкцию',
-				prerender: 'Пререндер',
-			},
-			fields: {
-				name: 'Название',
-				templateText: 'Template (LiquidJS)',
-				templateTextDescription: 'Синтаксис проверяется на бэкенде при сохранении.',
-				advancedMode: 'Расширенный режим (ST-совместимый)',
-				fallbackTemplateText: 'Fallback templateText (совместимость basic)',
-				fallbackTemplateTextDescription: 'Используется, если режим инструкции переключён обратно на basic.',
-				prerender: 'Пререндер',
-				prerenderDescription: 'Результат рендера Liquid на бэкенде (без генерации LLM).',
-				promptBlocks: 'Блоки промпта',
-				unsupportedBlock: 'не поддерживается в runtime',
-				responseConfig: 'Параметры ответа',
-				importSource: 'Источник импорта',
-				importFileName: 'Импортированный файл',
-				importedAt: 'Время импорта',
-				rawPreset: 'Raw ST preset (для round-trip хранения)',
-			},
-			placeholders: {
-				name: 'Введите название',
-				selectInstruction: 'Выберите инструкцию',
-				addPromptBlock: 'Добавить блок промпта',
-				promptBlockContent: 'Содержимое блока',
-			},
-			defaults: {
-				newInstruction: 'Новая инструкция',
-				importedInstruction: 'Импортированная инструкция',
-			},
-			confirm: {
-				deleteInstruction: 'Удалить инструкцию?',
-				exportStPreset: 'Экспортировать ST-совместимый пресет? (Отмена экспортирует формат TaleSpinner)',
-				sensitiveRemove: 'Найдены чувствительные connection-поля. Удалить их при импорте?',
-				sensitiveImportAsIs: 'Импортировать чувствительные поля как есть? (Отмена прерывает импорт)',
-			},
-			toasts: {
-				exportNotPossibleTitle: 'Экспорт невозможен',
-				selectForExport: 'Выберите инструкцию для экспорта',
-				importErrorTitle: 'Ошибка импорта',
-				importMissingTemplateText: 'Файл не содержит templateText',
-				importSuccessTitle: 'Импорт успешен',
-				importReadError: 'Не удалось прочитать файл',
-				createErrorTitle: 'Не удалось создать инструкцию',
-				saveErrorTitle: 'Не удалось сохранить инструкцию',
-				deleteErrorTitle: 'Не удалось удалить инструкцию',
-			},
-		};
+const ruInstructions = {
+	title: 'Инструкции',
+	presets: {
+		title: 'Chat Completion Presets',
+		bindLabel: 'Привязать пресет к подключению',
+		actions: {
+			bind: 'Привязать пресет к подключению',
+			unbind: 'Не привязывать пресет к подключению',
+			import: 'Импортировать пресет',
+			export: 'Экспортировать пресет',
+			delete: 'Удалить пресет',
+		},
+	},
+	actions: {
+		create: 'Создать инструкцию',
+		duplicate: 'Дублировать инструкцию',
+		delete: 'Удалить инструкцию',
+		prerender: 'Пререндер',
+		rename: 'Переименовать',
+		saveAs: 'Сохранить как новый',
+		updateCurrent: 'Обновить текущий пресет',
+		discardAndSwitch: 'Отбросить и переключить',
+		importWithoutSensitive: 'Импорт без чувствительных полей',
+		importAsIs: 'Импортировать как есть',
+	},
+	fields: {
+		name: 'Название',
+		templateText: 'Template (LiquidJS)',
+		templateTextDescription: 'Синтаксис проверяется на бэкенде при сохранении.',
+		advancedMode: 'Расширенный режим (ST-совместимый)',
+		fallbackTemplateText: 'Fallback templateText (совместимость basic)',
+		fallbackTemplateTextDescription: 'Используется, если режим инструкции переключён обратно на basic.',
+		prerender: 'Пререндер',
+		prerenderDescription: 'Результат рендера Liquid на бэкенде (без генерации LLM).',
+		promptBlocks: 'Блоки промпта',
+		unsupportedBlock: 'не поддерживается в runtime',
+		responseConfig: 'Параметры ответа',
+		importSource: 'Источник импорта',
+		importFileName: 'Импортированный файл',
+		importedAt: 'Время импорта',
+		rawPreset: 'Raw ST preset (для round-trip хранения)',
+		details: 'Детали ST пресета',
+		systemBlockTitle: 'Системный блок',
+		systemBlockDescription:
+			'Этот блок автоматически заполняется рантаймом и не редактируется напрямую в пресете.',
+		systemBlockSource: 'Источник в рантайме',
+	},
+	placeholders: {
+		name: 'Введите название',
+		selectInstruction: 'Выберите инструкцию',
+		addPromptBlock: 'Добавить блок промпта',
+		promptBlockContent: 'Содержимое блока',
+	},
+	defaults: {
+		newInstruction: 'Новая инструкция',
+		newPreset: 'Новый пресет',
+		importedInstruction: 'Импортированная инструкция',
+	},
+	confirm: {
+		deleteInstruction: 'Удалить инструкцию?',
+		discardChanges: 'Есть несохранённые изменения. Отбросить их и переключить пресет?',
+		sensitiveImportChoice:
+			'Найдены чувствительные connection-поля. Выберите, удалить их при импорте или сохранить для round-trip экспорта.',
+	},
+	dialogs: {
+		renameTitle: 'Переименовать пресет',
+		saveAsTitle: 'Сохранить пресет как',
+		deleteTitle: 'Удалить пресет',
+		discardTitle: 'Отбросить изменения?',
+		sensitiveImportTitle: 'Чувствительные поля импорта',
+	},
+	toasts: {
+		exportNotPossibleTitle: 'Экспорт невозможен',
+		selectForExport: 'Выберите инструкцию для экспорта',
+		stPresetOnlyExport: 'Из этого toolbar можно экспортировать только ST-совместимые пресеты',
+		importErrorTitle: 'Ошибка импорта',
+		importMissingTemplateText: 'Файл не содержит templateText',
+		importSuccessTitle: 'Импорт успешен',
+		importReadError: 'Не удалось прочитать файл',
+		createErrorTitle: 'Не удалось создать инструкцию',
+		saveErrorTitle: 'Не удалось сохранить инструкцию',
+		deleteErrorTitle: 'Не удалось удалить инструкцию',
+		createdTitle: 'Пресет создан',
+		savedTitle: 'Пресет сохранён',
+		bindWarningTitle: 'Пресет применён с предупреждениями',
+	},
+};
 
 export default ruInstructions;
-
diff --git a/web/src/i18n/resources/ru/provider.ts b/web/src/i18n/resources/ru/provider.ts
index 71091b44..db912e1c 100644
--- a/web/src/i18n/resources/ru/provider.ts
+++ b/web/src/i18n/resources/ru/provider.ts
@@ -1,92 +1,91 @@
-const ruProvider = {
-			providerLabel: 'API provider',
-			placeholders: {
-				selectProvider: 'Выберите провайдера...',
-				selectToken: 'Выберите токен...',
-				noTokens: 'Нет токенов',
-				selectModel: 'Выберите модель...',
-				selectTokenFirst: 'Сначала выберите токен',
-			},
-			tokens: {
-				title: 'Токены',
-				manage: 'Управление токенами',
-			},
-			config: {
-				title: 'Конфигурация провайдера',
-				baseUrl: 'Base URL',
-				defaultModel: 'Модель по умолчанию (опционально)',
-				checkConnection: 'Проверить подключение',
-				checkConnectionHelp:
-					'Проверка использует выбранный токен и текущий draft-конфиг. Сохранять настройки перед проверкой не нужно.',
-				connectionSuccessTitle: 'Подключение к провайдеру работает',
-				connectionErrorTitle: 'Проверка провайдера не прошла',
-				checkedEndpoint: 'Проверенный endpoint',
-				tokenPolicy: {
-					title: 'Политика токенов',
-					randomize: 'Использовать случайный токен, если токенов больше одного',
-					fallbackOnError: 'Fallback на следующий токен при pre-stream ошибках',
-				},
-				messageNormalization: {
-					title: 'Нормализация сообщений',
-					enabled: 'Склеивать все system-инструкции в одно сообщение',
-					helpText: 'Включено по умолчанию для совместимости с провайдерами, которые принимают только одно system-сообщение.',
-				},
-				anthropicCache: {
-					title: 'Anthropic prompt cache',
-					enabled: 'Включить кэш Anthropic/OpenRouter',
-					depth: 'Глубина кэша (от хвоста)',
-					ttl: 'TTL кэша',
-					helpText: 'Глубина считается от последнего сообщения; динамический хвост не кэшируется.',
-				},
-				save: 'Сохранить конфиг',
-			},
-			model: {
-				title: 'Модель',
-				load: 'Загрузить модели',
-				manual: 'Ручной id модели',
-				manualPlaceholder: 'например anthropic/claude-3.5-sonnet',
-				applyManual: 'Применить',
-				helpText: 'Если модель не выбрана, будет использоваться `defaultModel` провайдера (если задан) или дефолт провайдера.',
-			},
-			presets: {
-				title: 'LLM пресеты',
-				active: 'Активный пресет',
-				defaults: {
-					newPresetName: 'Новый LLM пресет',
-				},
-				actions: {
-					createPrompt: 'Введите название пресета',
-					renamePrompt: 'Введите новое название пресета',
-					create: 'Создать',
-					save: 'Сохранить',
-					rename: 'Переименовать',
-					duplicate: 'Дублировать',
-					delete: 'Удалить',
-				},
-				confirm: {
-					delete: 'Удалить выбранный пресет?',
-					discardChanges: 'Есть несохранённые изменения. Отменить их и переключить пресет?',
-				},
-				toasts: {
-					created: 'Пресет создан',
-					saved: 'Пресет сохранён',
-					deleted: 'Пресет удалён',
-					applied: 'Пресет применён',
-					appliedWithWarnings: 'Пресет применён с предупреждениями',
-					failed: 'Ошибка действия пресета',
-				},
-			},
-			toasts: {
-				configSaved: 'Конфиг провайдера сохранён',
-				configSaveFailed: 'Не удалось сохранить конфиг провайдера',
-				connectionCheckPassed: 'Проверка провайдера прошла',
-				connectionCheckFailed: 'Проверка провайдера не прошла',
-				modelsEmpty: 'Список моделей пуст',
-				modelsEmptyHelp:
-					'Провайдер не вернул ни одной модели. Проверьте Base URL, токен и используйте кнопку «Проверить подключение».',
-				modelsLoadFailed: 'Не удалось загрузить модели',
-			},
-		};
+const ruProvider = {
+	providerLabel: 'API provider',
+	placeholders: {
+		selectProvider: 'Выберите провайдера...',
+		selectToken: 'Выберите токен...',
+		noTokens: 'Нет токенов',
+		selectModel: 'Выберите модель...',
+		selectTokenFirst: 'Сначала выберите токен',
+	},
+	tokens: {
+		title: 'Токены',
+		manage: 'Управление токенами',
+	},
+	config: {
+		title: 'Конфигурация провайдера',
+		baseUrl: 'Base URL',
+		defaultModel: 'Модель по умолчанию (опционально)',
+		checkConnection: 'Проверить подключение',
+		checkConnectionHelp:
+			'Проверка использует выбранный токен и текущий draft-конфиг. Сохранять настройки перед проверкой не нужно.',
+		connectionSuccessTitle: 'Подключение к провайдеру работает',
+		connectionErrorTitle: 'Проверка провайдера не прошла',
+		checkedEndpoint: 'Проверенный endpoint',
+		tokenPolicy: {
+			title: 'Политика токенов',
+			randomize: 'Использовать случайный токен, если токенов больше одного',
+			fallbackOnError: 'Fallback на следующий токен при pre-stream ошибках',
+		},
+		messageNormalization: {
+			title: 'Нормализация сообщений',
+			enabled: 'Склеивать все system-инструкции в одно сообщение',
+			helpText: 'Включено по умолчанию для совместимости с провайдерами, которые принимают только одно system-сообщение.',
+		},
+		anthropicCache: {
+			title: 'Anthropic prompt cache',
+			enabled: 'Включить кэш Anthropic/OpenRouter',
+			depth: 'Глубина кэша (от хвоста)',
+			ttl: 'TTL кэша',
+			helpText: 'Глубина считается от последнего сообщения; динамический хвост не кэшируется.',
+		},
+		save: 'Сохранить конфиг',
+	},
+	model: {
+		title: 'Модель',
+		load: 'Загрузить модели',
+		manual: 'Ручной id модели',
+		manualPlaceholder: 'например anthropic/claude-3.5-sonnet',
+		applyManual: 'Применить',
+		helpText: 'Если модель не выбрана, будет использоваться `defaultModel` провайдера (если задан) или дефолт провайдера.',
+	},
+	presets: {
+		title: 'Пресеты подключения',
+		active: 'Активный пресет',
+		defaults: {
+			newPresetName: 'Новый пресет подключения',
+		},
+		actions: {
+			createPrompt: 'Введите название пресета',
+			renamePrompt: 'Введите новое название пресета',
+			create: 'Создать',
+			save: 'Сохранить',
+			rename: 'Переименовать',
+			duplicate: 'Дублировать',
+			delete: 'Удалить',
+		},
+		confirm: {
+			delete: 'Удалить выбранный пресет?',
+			discardChanges: 'Есть несохранённые изменения. Отменить их и переключить пресет?',
+		},
+		toasts: {
+			created: 'Пресет создан',
+			saved: 'Пресет сохранён',
+			deleted: 'Пресет удалён',
+			applied: 'Пресет применён',
+			appliedWithWarnings: 'Пресет применён с предупреждениями',
+			failed: 'Ошибка действия пресета',
+		},
+	},
+	toasts: {
+		configSaved: 'Конфиг провайдера сохранён',
+		configSaveFailed: 'Не удалось сохранить конфиг провайдера',
+		connectionCheckPassed: 'Проверка провайдера прошла',
+		connectionCheckFailed: 'Проверка провайдера не прошла',
+		modelsEmpty: 'Список моделей пуст',
+		modelsEmptyHelp:
+			'Провайдер не вернул ни одной модели. Проверьте Base URL, токен и используйте кнопку «Проверить подключение».',
+		modelsLoadFailed: 'Не удалось загрузить модели',
+	},
+};
 
 export default ruProvider;
-
diff --git a/web/src/model/app-settings/index.ts b/web/src/model/app-settings/index.ts
index e2b21438..ce1e7ecc 100644
--- a/web/src/model/app-settings/index.ts
+++ b/web/src/model/app-settings/index.ts
@@ -27,6 +27,7 @@ const defaultAppSettings: AppSettings = {
 	language: 'ru',
 	openLastChat: false,
 	autoSelectCurrentPersona: false,
+	bindChatCompletionPresetToConnection: false,
 };
 
 // Store
diff --git a/web/src/model/instructions/index.ts b/web/src/model/instructions/index.ts
index 5fb2f686..e38f2e26 100644
--- a/web/src/model/instructions/index.ts
+++ b/web/src/model/instructions/index.ts
@@ -14,6 +14,13 @@ import { $currentChat, setChatInstructionRequested, setOpenedChat } from '../cha
 import type { InstructionDto } from '../../api/instructions';
 import type { InstructionMeta } from '@shared/types/instructions';
 
+export type InstructionEditorDraft = {
+	sourceInstructionId: string;
+	name: string;
+	templateText: string;
+	meta?: InstructionMeta;
+};
+
 function isInstructionDto(value: unknown): value is InstructionDto {
 	if (!value || typeof value !== 'object') return false;
 	const item = value as Record<string, unknown>;
@@ -55,6 +62,7 @@ export const $selectedInstruction = combine($instructions, $selectedInstructionI
 });
 
 export const instructionSelected = createEvent<string>();
+export const instructionEditorDraftChanged = createEvent<InstructionEditorDraft | null>();
 
 const refreshRequested = createEvent();
 
@@ -149,6 +157,10 @@ export const updateInstructionFx = createEffect(
 
 export const deleteInstructionFx = createEffect(async (params: { id: string }) => deleteInstruction(params.id));
 
+export const $instructionEditorDraft = createStore<InstructionEditorDraft | null>(null)
+	.on(instructionEditorDraftChanged, (_, draft) => draft)
+	.reset(setSelectedInstructionId, deleteInstructionFx.doneData);
+
 export const createInstructionRequested = createEvent();
 export const duplicateInstructionRequested = createEvent<{ id: string }>();
 export const importInstructionRequested = createEvent<{ name: string; templateText: string; meta?: InstructionMeta }>();
diff --git a/web/src/model/instructions/st-preset.ts b/web/src/model/instructions/st-preset.ts
index 50acafc6..97f41afb 100644
--- a/web/src/model/instructions/st-preset.ts
+++ b/web/src/model/instructions/st-preset.ts
@@ -6,9 +6,102 @@ import type {
 	StPromptOrder,
 	TsInstructionMetaV1,
 } from '@shared/types/instructions';
+import type { LlmProviderConfig, LlmProviderId } from '@shared/types/llm';
 
 const PROMPT_ORDER_PREFERRED_CHARACTER_ID = 100001;
 
+export const ST_SYSTEM_PROMPT_DEFAULTS: StPrompt[] = [
+	{
+		identifier: 'main',
+		name: 'Main Prompt',
+		system_prompt: true,
+		role: 'system',
+		content: "Write {{char}}'s next reply in a fictional chat between {{charIfNotGroup}} and {{user}}.",
+	},
+	{
+		identifier: 'nsfw',
+		name: 'Auxiliary Prompt',
+		system_prompt: true,
+		role: 'system',
+		content: '',
+	},
+	{
+		identifier: 'dialogueExamples',
+		name: 'Chat Examples',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'jailbreak',
+		name: 'Post-History Instructions',
+		system_prompt: true,
+		role: 'system',
+		content: '',
+	},
+	{
+		identifier: 'chatHistory',
+		name: 'Chat History',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'worldInfoAfter',
+		name: 'World Info (after)',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'worldInfoBefore',
+		name: 'World Info (before)',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'enhanceDefinitions',
+		name: 'Enhance Definitions',
+		system_prompt: true,
+		role: 'system',
+		content:
+			"If you have more knowledge of {{char}}, add to the character's lore and personality to enhance them but keep the Character Sheet's definitions absolute.",
+		marker: false,
+	},
+	{
+		identifier: 'charDescription',
+		name: 'Char Description',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'charPersonality',
+		name: 'Char Personality',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'scenario',
+		name: 'Scenario',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'personaDescription',
+		name: 'Persona Description',
+		system_prompt: true,
+		marker: true,
+	},
+];
+
+export const ST_PROMPT_SOURCE_LABELS: Partial<Record<string, string>> = {
+	charDescription: 'Character Description',
+	charPersonality: 'Character Personality',
+	scenario: 'Character Scenario',
+	personaDescription: 'Persona Description',
+	worldInfoBefore: 'World Info (before character)',
+	worldInfoAfter: 'World Info (after character)',
+	dialogueExamples: 'Dialogue Examples',
+	chatHistory: 'Chat History',
+};
+
 const ST_PRESET_DETECT_KEYS = new Set([
 	'chat_completion_source',
 	'prompts',
@@ -32,6 +125,7 @@ export const ST_SENSITIVE_FIELDS = [
 ] as const;
 
 type SensitiveImportMode = 'remove' | 'keep';
+type ConnectionFieldStatus = 'supported' | 'sensitive' | 'unsupported';
 
 type StResponseConfigKey = keyof StAdvancedResponseConfig;
 type StResponseNumericKey =
@@ -65,6 +159,31 @@ const ST_RESPONSE_CONFIG_KEYS: StResponseConfigKey[] = [
 	'stream_openai',
 ];
 
+const ST_CONNECTION_FIELDS: Array<{ key: string; status: ConnectionFieldStatus }> = [
+	{ key: 'chat_completion_source', status: 'supported' },
+	{ key: 'openai_model', status: 'supported' },
+	{ key: 'reverse_proxy', status: 'sensitive' },
+	{ key: 'proxy_password', status: 'sensitive' },
+	{ key: 'custom_url', status: 'sensitive' },
+	{ key: 'custom_include_body', status: 'sensitive' },
+	{ key: 'custom_exclude_body', status: 'sensitive' },
+	{ key: 'custom_include_headers', status: 'sensitive' },
+	{ key: 'vertexai_region', status: 'sensitive' },
+	{ key: 'vertexai_express_project_id', status: 'sensitive' },
+	{ key: 'azure_base_url', status: 'sensitive' },
+	{ key: 'azure_deployment_name', status: 'sensitive' },
+	{ key: 'openrouter_group_models', status: 'unsupported' },
+];
+
+export type StPresetBindingPlan = {
+	runtimePatch: {
+		activeProviderId?: LlmProviderId;
+		activeModel?: string | null;
+	} | null;
+	providerConfigPatches: Array<{ providerId: LlmProviderId; config: LlmProviderConfig }>;
+	warnings: string[];
+};
+
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -105,6 +224,9 @@ function normalizePrompt(value: unknown): StPrompt | null {
 	if (typeof value.system_prompt === 'boolean') {
 		prompt.system_prompt = value.system_prompt;
 	}
+	if (typeof value.marker === 'boolean') {
+		prompt.marker = value.marker;
+	}
 	return prompt;
 }
 
@@ -208,6 +330,21 @@ export function withTsInstructionMeta(params: {
 	};
 }
 
+export function createTsInstructionMeta(params: {
+	meta: unknown;
+	mode: TsInstructionMetaV1['mode'];
+	stAdvanced: StAdvancedConfig;
+}): InstructionMeta {
+	return withTsInstructionMeta({
+		meta: params.meta,
+		tsInstruction: {
+			version: 1,
+			mode: params.mode,
+			stAdvanced: params.stAdvanced,
+		},
+	});
+}
+
 export function detectStChatCompletionPreset(
 	input: unknown
 ): input is Record<string, unknown> {
@@ -232,7 +369,22 @@ export function stripSensitiveFieldsFromPreset(
 
 export function normalizeStPrompts(input: unknown): StPrompt[] {
 	if (!Array.isArray(input)) return [];
-	return input.map(normalizePrompt).filter((item): item is StPrompt => Boolean(item));
+	const normalized = input.map(normalizePrompt).filter((item): item is StPrompt => Boolean(item));
+	const byIdentifier = new Map<string, StPrompt>();
+
+	for (const prompt of ST_SYSTEM_PROMPT_DEFAULTS) {
+		byIdentifier.set(prompt.identifier, { ...prompt });
+	}
+
+	for (const prompt of normalized) {
+		const existing = byIdentifier.get(prompt.identifier);
+		byIdentifier.set(prompt.identifier, {
+			...(existing ?? {}),
+			...prompt,
+		});
+	}
+
+	return Array.from(byIdentifier.values());
 }
 
 export function normalizeStPromptOrder(input: unknown): StPromptOrder[] {
@@ -294,6 +446,18 @@ export function resolvePreferredPromptOrder(stAdvanced: StAdvancedConfig): StPro
 	};
 }
 
+export function getStPromptDefinition(identifier: string): StPrompt | null {
+	return ST_SYSTEM_PROMPT_DEFAULTS.find((item) => item.identifier === identifier) ?? null;
+}
+
+export function isSystemMarkerPrompt(prompt: StPrompt | null | undefined): boolean {
+	return prompt?.marker === true;
+}
+
+export function getStPromptSourceLabel(identifier: string): string | null {
+	return ST_PROMPT_SOURCE_LABELS[identifier] ?? null;
+}
+
 export function buildStPresetFromAdvanced(stAdvanced: StAdvancedConfig): Record<string, unknown> {
 	const preset = structuredClone(stAdvanced.rawPreset ?? {});
 	preset.prompts = stAdvanced.prompts.map((item) => ({ ...item }));
@@ -313,3 +477,50 @@ export function buildStPresetFromAdvanced(stAdvanced: StAdvancedConfig): Record<
 
 	return preset;
 }
+
+export function listConnectionFieldWarnings(preset: Record<string, unknown>): string[] {
+	const presentFields = ST_CONNECTION_FIELDS.filter(({ key }) =>
+		Object.prototype.hasOwnProperty.call(preset, key)
+	);
+	if (presentFields.length === 0) return [];
+
+	const warnings: string[] = [];
+	const sensitive = presentFields.filter((item) => item.status === 'sensitive').map((item) => item.key);
+	const unsupported = presentFields.filter((item) => item.status === 'unsupported').map((item) => item.key);
+
+	if (sensitive.length > 0) {
+		warnings.push(`Sensitive connection fields were preserved but not auto-applied: ${sensitive.join(', ')}`);
+	}
+	if (unsupported.length > 0) {
+		warnings.push(`Unsupported connection fields remain raw-only: ${unsupported.join(', ')}`);
+	}
+
+	return warnings;
+}
+
+export function createBestEffortLlmBindingPlan(stAdvanced: StAdvancedConfig): StPresetBindingPlan {
+	const preset = stAdvanced.rawPreset ?? {};
+	const warnings = [...listConnectionFieldWarnings(preset)];
+	const source = asString(preset.chat_completion_source);
+	const model = asString(preset.openai_model);
+
+	let activeProviderId: LlmProviderId | undefined;
+	if (source === 'openrouter') {
+		activeProviderId = 'openrouter';
+	} else if (source) {
+		activeProviderId = 'openai_compatible';
+		warnings.push(`Mapped ST source "${source}" to TaleSpinner provider "openai_compatible".`);
+	}
+
+	return {
+		runtimePatch:
+			activeProviderId || model
+				? {
+						activeProviderId,
+						activeModel: model ?? null,
+					}
+				: null,
+		providerConfigPatches: [],
+		warnings,
+	};
+}

From 5fb302e9140dccc9b188985e8cf914d839012003 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Tue, 10 Mar 2026 00:52:32 +0300
Subject: [PATCH 06/54] fix: up

---
 .../artifacts-concept-v2-draft-2026-03-07.md  | 186 ++++++++++++++++++
 1 file changed, 186 insertions(+)

diff --git a/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md b/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md
index 016905da..66c783e8 100644
--- a/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md
+++ b/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md
@@ -534,3 +534,189 @@ Exposure:
 5. Нужен ли `ui_panel` уже в первой версии, или его лучше отложить.
 6. Насколько exposure-конфиг должен быть low-level, а насколько через пресеты.
 
+
+## 18. Engineering Notes Against Current Codebase
+
+Ниже зафиксированы выводы после сопоставления этого концепта с текущей реализацией в коде.
+
+### 18.1. Общее направление концепта считается правильным
+
+Текущий runtime уже подтверждает исходную проблему модели:
+
+- у операции сейчас есть три разных output-механизма:
+  - `artifacts`
+  - `prompt_time`
+  - `turn_canonicalization`
+- эти три механизма проходят через разные типы, валидаторы, UI-формы и commit-ветки
+- при этом по смыслу все они являются вариантами одного и того же сценария:
+  - операция вычисляет результат
+  - результат влияет на state, prompt, UI или turn
+
+Следствие:
+
+- переход к модели `operation -> artifact state -> exposures` уменьшает концептуальную сложность
+- это не искусственное усложнение, а нормализация уже существующей логики
+
+
+### 18.2. Главное достоинство v2: разделение state и publication
+
+Это сильнейшее улучшение по сравнению с ранней моделью.
+
+В текущем коде `usage` хранится у артефакта, но не является полноценным исполняемым механизмом публикации.
+
+Фактически сейчас:
+
+- artifact store знает про `usage`
+- artifact store знает про `semantics`
+- но prompt/UI не строятся автоматически из artifact config
+- prompt-time и canonicalization живут как отдельные ветки runtime
+
+Следствие:
+
+- `usage` в текущем виде смешивает intent и storage metadata
+- exposures действительно лучше выражают поведение, чем единый флаг `usage`
+
+
+### 18.3. Концепт хорошо ложится на существующую parts-модель
+
+Это важное наблюдение: проект уже имеет сильную substrate-модель через `entry parts`.
+
+Особенно хорошо это видно на current canonicalization flow:
+
+- rewrite user turn уже materialize-ится через новый part
+- этот part ссылается на прошлый через `replacesPartId`
+- UI projection уже умеет replacement chains
+- у parts уже есть:
+  - `visibility`
+  - `lifespan`
+  - `prompt/ui` projection metadata
+
+Следствие:
+
+- `turn_rewrite` должен опираться на parts, а не создавать отдельную независимую механику
+- `ui_inline` и часть prompt materialization по возможности тоже должны использовать parts
+- тезис концепта "не строить вторую параллельную систему поверх parts" считается верным
+
+
+### 18.4. Что обязательно нужно уточнить перед реализацией
+
+#### A. Artifact value не должен остаться только строкой
+
+В текущем runtime artifact value фактически строковый:
+
+- `value: string`
+- `history: string[]`
+
+Для новой модели этого недостаточно, потому что концепт уже предполагает:
+
+- `text`
+- `markdown`
+- `json`
+
+Поэтому для v2 базовый контракт артефакта должен сразу учитывать:
+
+- `format`
+- `value: unknown`
+- optional `schemaId` или другой способ типизации structured payload
+
+Это не стоит откладывать в "потом", иначе первая реализация снова будет слишком тексто-центричной.
+
+
+#### B. Single-writer инвариант надо валидировать на уровне compiled profile
+
+Сейчас duplicate artifact tag проверяется только внутри одного блока операций.
+
+Но профиль собирается из нескольких block refs.
+
+Следствие:
+
+- два разных блока уже сейчас могут теоретически писать в один и тот же `tag`
+- при переходе на новую artifact-centric модель это станет более опасным, чем сейчас
+
+Поэтому инвариант:
+
+- один primary artifact writer на `tag`
+
+нужно проверять не только внутри блока, но и после сборки всего profile runtime graph.
+
+
+#### C. Hook restrictions не должны исчезнуть
+
+Текущий runtime содержит важные policy-ограничения:
+
+- prompt effects допустимы только в `before_main_llm`
+- assistant rewrite допустим только в `after_main_llm`
+
+В новой модели это не должно потеряться.
+
+Следствие:
+
+- ограничения должны переехать в exposure policy
+- нельзя полагаться только на "гибкость" новой схемы
+- exposure type должен валидироваться относительно hook, target и lifecycle
+
+
+### 18.5. Что лучше не делать в первой миграции
+
+#### Не переписывать весь runtime за один шаг
+
+Практически безопаснее сделать двухслойную миграцию:
+
+1. Пользовательская модель и конфиг переходят на `artifact + exposures`
+2. Внутренний runtime временно компилирует exposures в уже существующие internal runtime effects
+
+Например:
+
+- `prompt_part` -> текущие prompt effect handlers
+- `turn_rewrite` -> текущие turn effect handlers
+- artifact state commit -> текущие artifact stores
+
+Такой путь дает:
+
+- меньший риск регрессий
+- более предсказуемую миграцию UI и validator слоя
+- возможность сохранить текущие commit/tests/debug flows на переходный период
+
+
+#### Не делать `ui_panel` центром первой версии
+
+`ui_panel` полезен, но сейчас он не должен тянуть архитектуру первой версии.
+
+Для v1 достаточно считать минимальным набором:
+
+1. `prompt_part`
+2. `prompt_message`
+3. `turn_rewrite`
+4. `ui_inline`
+
+`ui_panel` лучше оставить future-ready extension.
+
+
+#### Не переоценивать необходимость `append` как отдельного write mode в первой версии
+
+Сейчас stores уже ведут history append-подобным способом.
+
+Поэтому перед добавлением отдельного artifact write mode нужно отдельно доказать, что простой модели:
+
+- `current`
+- `history`
+- history snapshots on commit
+
+недостаточно для ближайших сценариев.
+
+Иначе это добавит сложность раньше времени.
+
+
+### 18.6. Практический итог
+
+Этот концепт рекомендуется принять как целевую модель.
+
+Но внедрять его лучше при следующих условиях:
+
+1. artifact state не ограничен строкой
+2. single-writer validation поднимается до уровня compiled profile
+3. hook/exposure policy фиксируется явно
+4. первая миграция идет через compilation в существующие internal runtime effects
+5. `ui_panel` и, возможно, `append` остаются за пределами первой рабочей версии
+
+В таком виде концепт выглядит не только теоретически чище, но и реалистично внедряемым в текущую архитектуру проекта.

From 36e9baf3a4c03e8943a39114b89bb07e82652a93 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Wed, 11 Mar 2026 00:00:17 +0300
Subject: [PATCH 07/54] Fix artifact tag access issues

---
 .codex/environments/environment.toml          |   6 +
 .../artifacts-concept-v2-draft-2026-03-07.md  |  10 +-
 .../chat-core/prompt-template-renderer.ts     |   8 +-
 .../chat-entry-parts/parts-repository.ts      |   2 +-
 .../profile-session-artifact-store.ts         |  50 +-
 .../artifacts/run-artifact-store.test.ts      |  42 +-
 .../artifacts/run-artifact-store.ts           |  40 +-
 .../chat-generation-v3/contracts.test.ts      | 116 +++--
 .../services/chat-generation-v3/contracts.ts  | 160 ++++--
 .../operations/commit-effects-phase.test.ts   |  30 +-
 .../operations/commit-effects-phase.ts        |  30 +-
 .../effect-handlers/artifact-effects.test.ts  |  30 +-
 .../effect-handlers/artifact-effects.ts       |  23 +-
 .../effect-handlers/ui-effects.test.ts        | 222 +++++++++
 .../operations/effect-handlers/ui-effects.ts  | 142 ++++++
 .../operations/effect-policy.test.ts          |  12 +-
 .../execute-operations-phase.test.ts          |  79 ++-
 .../operations/execute-operations-phase.ts    | 174 +++----
 .../operations-flow.integration.test.ts       |  48 +-
 .../orchestration/run-operation-hook-phase.ts |   5 +-
 .../orchestration/run-state-helpers.ts        |   8 +-
 .../run-chat-generation-v3.ts                 |   2 +
 .../runtime/operation-runtime-state.test.ts   |  27 +-
 .../operation-block-validator.test.ts         | 124 +++++
 .../operations/operation-block-validator.ts   | 402 +++++++++------
 .../operations/operation-blocks-repository.ts |  11 +-
 .../operation-profile-resolver.test.ts        |  67 ++-
 .../operations/operation-profile-resolver.ts  |   4 +
 .../template-operations-runtime.test.ts       | 100 +++-
 .../operations/template-operations-runtime.ts | 167 +++----
 shared/types/operation-profiles.ts            | 456 ++++++++++++++++--
 .../form/operation-profile-form-mapping.ts    | 291 +++++------
 .../ui/operation-editor/operation-editor.tsx  |  35 +-
 .../sections/output-section.tsx               | 456 +++++++++---------
 .../i18n/resources/en/operationProfiles.ts    |  69 ++-
 .../i18n/resources/ru/operationProfiles.ts    |  86 ++--
 36 files changed, 2478 insertions(+), 1056 deletions(-)
 create mode 100644 .codex/environments/environment.toml
 create mode 100644 server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.test.ts
 create mode 100644 server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.ts

diff --git a/.codex/environments/environment.toml b/.codex/environments/environment.toml
new file mode 100644
index 00000000..8b52c31b
--- /dev/null
+++ b/.codex/environments/environment.toml
@@ -0,0 +1,6 @@
+# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY
+version = 1
+name = "TaleSpinner_v1"
+
+[setup]
+script = "yarn install:all"
diff --git a/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md b/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md
index 66c783e8..cb939270 100644
--- a/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md
+++ b/knowledge-base/artifacts-concept-v2-draft-2026-03-07.md
@@ -220,7 +220,8 @@ type ArtifactPersistence = "run_only" | "persisted";
 type ArtifactWriteMode = "replace" | "append";
 
 type OperationArtifactConfig = {
-  tag: string;
+  artifactId: string; // internal stable id
+  tag: string; // human-readable unique alias for templates and references
   title: string;
   description?: string;
 
@@ -237,6 +238,9 @@ type OperationArtifactConfig = {
 };
 ```
 
+Шаблонный доступ к другим артефактам должен идти через `tag`, например `{{art.story_summary.value}}`.
+`artifactId` остается внутренним ключом хранения и не должен становиться основным пользовательским API.
+
 ```ts
 type ArtifactRecord = {
   tag: string;
@@ -527,8 +531,8 @@ Exposure:
 
 После принятия этого концепта отдельно нужно решить:
 
-1. Должен ли `tag` быть глобально уникален в profile или вычисляться автоматически из operation id.
-2. Нужен ли пользователю editable `tag`, или лучше иметь стабильный internal id и отдельный display name.
+1. `tag` должен быть user-facing и уникальным в пределах compiled profile.
+2. `artifactId` должен оставаться internal stable id; ссылки из шаблонов идут по `tag`, а не по `artifactId` и не по `opId`.
 3. Должен ли `turn_rewrite` всегда персиститься в parts.
 4. Нужен ли `append` как write mode в первой версии, или пока достаточно только `replace`.
 5. Нужен ли `ui_panel` уже в первой версии, или его лучше отложить.
diff --git a/server/src/services/chat-core/prompt-template-renderer.ts b/server/src/services/chat-core/prompt-template-renderer.ts
index 2e5c35a1..cb3c1502 100644
--- a/server/src/services/chat-core/prompt-template-renderer.ts
+++ b/server/src/services/chat-core/prompt-template-renderer.ts
@@ -6,9 +6,10 @@ export interface InstructionRenderContext {
   chat: unknown;
   messages: Array<{ role: string; content: string }>;
   rag: unknown;
-  // Persisted pipeline artifacts materialized as `art.<tag>.value/history`.
-  // v1: chat-scoped session only.
+  // Artifacts materialized as `art.<artifactId>.value/history`.
+  // `artByOpId` is a convenience alias for cross-operation references from templates.
   art?: Record<string, unknown>;
+  artByOpId?: Record<string, unknown>;
   now: string;
 
   // --- SillyTavern-like convenience variables (compat layer).
@@ -391,7 +392,7 @@ export async function renderLiquidTemplate(params: {
 
   // Additional passes: render again only if the output still looks like a template.
   // Important: if the output contains `{{` for non-template reasons (e.g. documentation/code),
-  // the next parse may throw — in that case we stop and return the previous output.
+  // the next parse may throw — in that case we stop and return the previous output.
   for (let pass = 2; pass <= maxPasses; pass++) {
     if (!mightContainLiquidSyntax(current)) break;
     if (current.length > maxOutputChars) break;
@@ -417,3 +418,4 @@ export async function renderLiquidTemplate(params: {
 
   return current;
 }
+
diff --git a/server/src/services/chat-entry-parts/parts-repository.ts b/server/src/services/chat-entry-parts/parts-repository.ts
index a537b964..6646ec31 100644
--- a/server/src/services/chat-entry-parts/parts-repository.ts
+++ b/server/src/services/chat-entry-parts/parts-repository.ts
@@ -85,7 +85,7 @@ type CreatePartParams = {
   variantId: string;
   channel: PartChannel;
   order: number;
-  payload: string | object;
+  payload: string | object | number | boolean | null;
   payloadFormat: PartPayloadFormat;
   schemaId?: string;
   label?: string;
diff --git a/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts b/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
index 44177777..9b11cd50 100644
--- a/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
+++ b/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
@@ -7,8 +7,9 @@ import { operationProfileSessionArtifacts } from "../../../db/schema";
 
 import type { ArtifactValue } from "../contracts";
 import type {
+  ArtifactFormat,
   ArtifactSemantics,
-  ArtifactUsage,
+  ArtifactWriteMode,
   OperationProfile,
 } from "@shared/types/operation-profiles";
 import type { OperationActivationState } from "../operations/operation-activation-intervals";
@@ -17,9 +18,9 @@ import type { OperationActivationState } from "../operations/operation-activatio
 const MAX_HISTORY_ITEMS = 20;
 const INTERNAL_OPERATION_ACTIVATION_TAG_PREFIX = "__sys_op_activation__:";
 
-function normalizeHistory(input: unknown, nextValue: string): string[] {
-  const parsed = Array.isArray(input) ? input.filter((v): v is string => typeof v === "string") : [];
-  return [...parsed, nextValue].slice(-MAX_HISTORY_ITEMS);
+function normalizeHistory(input: unknown, nextValue: unknown, maxItems: number): unknown[] {
+  const parsed = Array.isArray(input) ? input : [];
+  return [...parsed, nextValue].slice(-maxItems);
 }
 
 function normalizeActivationState(input: unknown): OperationActivationState {
@@ -58,16 +59,17 @@ export class ProfileSessionArtifactStore {
     const out: Record<string, ArtifactValue> = {};
     for (const row of rows) {
       if (row.tag.startsWith(INTERNAL_OPERATION_ACTIVATION_TAG_PREFIX)) continue;
-      const usage = (row.usage ?? "internal") as ArtifactUsage;
+      const format = ((row.usage ?? "markdown") as ArtifactFormat) || "markdown";
       const semantics = (row.semantics ?? "intermediate") as ArtifactSemantics;
-      const value = safeJsonParse<string>(row.valueJson, "");
-      const history = safeJsonParse<string[]>(row.historyJson, []);
+      const value = safeJsonParse<unknown>(row.valueJson, "");
+      const history = safeJsonParse<unknown[]>(row.historyJson, []);
       out[row.tag] = {
-        usage,
+        format,
         semantics,
         persistence: "persisted",
+        writeMode: "replace",
         value,
-        history: Array.isArray(history) ? history.filter((v) => typeof v === "string") : [],
+        history: Array.isArray(history) ? history : [],
       };
     }
     return out;
@@ -110,9 +112,14 @@ export class ProfileSessionArtifactStore {
     branchId: string;
     profile: OperationProfile | null;
     tag: string;
-    usage: ArtifactUsage;
+    format: ArtifactFormat;
     semantics: ArtifactSemantics;
-    value: string;
+    writeMode: ArtifactWriteMode;
+    history: {
+      enabled: boolean;
+      maxItems: number;
+    };
+    value: unknown;
   }): Promise<ArtifactValue> {
     const db = await initDb();
     const existingRows = await db
@@ -128,15 +135,21 @@ export class ProfileSessionArtifactStore {
 
     const now = new Date();
     const existing = existingRows[0];
-    const history = normalizeHistory(existing ? safeJsonParse(existing.historyJson, []) : [], params.value);
+    const history = params.history.enabled
+      ? normalizeHistory(
+          existing ? safeJsonParse(existing.historyJson, []) : [],
+          params.value,
+          params.history.maxItems
+        )
+      : [];
 
     if (existing) {
       await db
         .update(operationProfileSessionArtifacts)
         .set({
-          usage: params.usage,
+          usage: params.format,
           semantics: params.semantics,
-          valueJson: safeJsonStringify(params.value, "\"\""),
+          valueJson: safeJsonStringify(params.value, "null"),
           historyJson: safeJsonStringify(history, "[]"),
           updatedAt: now,
         })
@@ -152,18 +165,19 @@ export class ProfileSessionArtifactStore {
         profileVersion: params.profile?.version ?? null,
         operationProfileSessionId: params.profile?.operationProfileSessionId ?? null,
         tag: params.tag,
-        usage: params.usage,
+        usage: params.format,
         semantics: params.semantics,
-        valueJson: safeJsonStringify(params.value, "\"\""),
+        valueJson: safeJsonStringify(params.value, "null"),
         historyJson: safeJsonStringify(history, "[]"),
         updatedAt: now,
       });
     }
 
     return {
-      usage: params.usage,
+      format: params.format,
       semantics: params.semantics,
       persistence: "persisted",
+      writeMode: params.writeMode,
       value: params.value,
       history,
     };
@@ -213,7 +227,7 @@ export class ProfileSessionArtifactStore {
       profileVersion: params.profile?.version ?? null,
       operationProfileSessionId: params.profile?.operationProfileSessionId ?? null,
       tag,
-      usage: "internal",
+      usage: "json",
       semantics: "state",
       valueJson: safeJsonStringify(params.state, "{}"),
       historyJson: "[]",
diff --git a/server/src/services/chat-generation-v3/artifacts/run-artifact-store.test.ts b/server/src/services/chat-generation-v3/artifacts/run-artifact-store.test.ts
index a3009ded..67045e93 100644
--- a/server/src/services/chat-generation-v3/artifacts/run-artifact-store.test.ts
+++ b/server/src/services/chat-generation-v3/artifacts/run-artifact-store.test.ts
@@ -12,16 +12,19 @@ describe("RunArtifactStore", () => {
     const store = new RunArtifactStore();
 
     const artifact = store.upsert({
-      tag: "world_state",
-      usage: "internal",
+      artifactId: "world_state",
+      format: "markdown",
       semantics: "intermediate",
+      writeMode: "replace",
+      history: { enabled: true, maxItems: 20 },
       value: "v1",
     });
 
     expect(artifact).toEqual({
-      usage: "internal",
+      format: "markdown",
       semantics: "intermediate",
       persistence: "run_only",
+      writeMode: "replace",
       value: "v1",
       history: ["v1"],
     });
@@ -32,22 +35,27 @@ describe("RunArtifactStore", () => {
     const store = new RunArtifactStore();
 
     store.upsert({
-      tag: "memory",
-      usage: "internal",
+      artifactId: "memory",
+      format: "markdown",
       semantics: "intermediate",
+      writeMode: "replace",
+      history: { enabled: true, maxItems: 20 },
       value: "first",
     });
     const second = store.upsert({
-      tag: "memory",
-      usage: "prompt_only",
+      artifactId: "memory",
+      format: "json",
       semantics: "state",
+      writeMode: "append",
+      history: { enabled: true, maxItems: 20 },
       value: "second",
     });
 
     expect(second).toEqual({
-      usage: "prompt_only",
+      format: "json",
       semantics: "state",
       persistence: "run_only",
+      writeMode: "append",
       value: "second",
       history: ["first", "second"],
     });
@@ -56,30 +64,36 @@ describe("RunArtifactStore", () => {
   test("snapshot returns record with all tags", () => {
     const store = new RunArtifactStore();
     store.upsert({
-      tag: "a",
-      usage: "internal",
+      artifactId: "a",
+      format: "markdown",
       semantics: "intermediate",
+      writeMode: "replace",
+      history: { enabled: true, maxItems: 20 },
       value: "1",
     });
     store.upsert({
-      tag: "b",
-      usage: "ui_only",
+      artifactId: "b",
+      format: "text",
       semantics: "log/feed",
+      writeMode: "append",
+      history: { enabled: true, maxItems: 20 },
       value: "2",
     });
 
     expect(store.snapshot()).toEqual({
       a: {
-        usage: "internal",
+        format: "markdown",
         semantics: "intermediate",
         persistence: "run_only",
+        writeMode: "replace",
         value: "1",
         history: ["1"],
       },
       b: {
-        usage: "ui_only",
+        format: "text",
         semantics: "log/feed",
         persistence: "run_only",
+        writeMode: "append",
         value: "2",
         history: ["2"],
       },
diff --git a/server/src/services/chat-generation-v3/artifacts/run-artifact-store.ts b/server/src/services/chat-generation-v3/artifacts/run-artifact-store.ts
index a508561e..203cb241 100644
--- a/server/src/services/chat-generation-v3/artifacts/run-artifact-store.ts
+++ b/server/src/services/chat-generation-v3/artifacts/run-artifact-store.ts
@@ -1,5 +1,9 @@
 import type { ArtifactValue } from "../contracts";
-import type { ArtifactUsage, ArtifactSemantics } from "@shared/types/operation-profiles";
+import type {
+  ArtifactFormat,
+  ArtifactSemantics,
+  ArtifactWriteMode,
+} from "@shared/types/operation-profiles";
 
 
 export class RunArtifactStore {
@@ -16,32 +20,46 @@ export class RunArtifactStore {
   }
 
   upsert(params: {
-    tag: string;
-    usage: ArtifactUsage;
+    artifactId: string;
+    format: ArtifactFormat;
     semantics: ArtifactSemantics;
-    value: string;
+    writeMode: ArtifactWriteMode;
+    history: {
+      enabled: boolean;
+      maxItems: number;
+    };
+    value: unknown;
   }): ArtifactValue {
-    const existing = this.byTag.get(params.tag);
+    const existing = this.byTag.get(params.artifactId);
+    const nextHistory = existing
+      ? [...existing.history, params.value]
+      : [params.value];
+    const history = params.history.enabled
+      ? nextHistory.slice(-params.history.maxItems)
+      : [];
+
     if (existing) {
       const next: ArtifactValue = {
         ...existing,
-        usage: params.usage,
+        format: params.format,
         semantics: params.semantics,
+        writeMode: params.writeMode,
         value: params.value,
-        history: [...existing.history, params.value],
+        history,
       };
-      this.byTag.set(params.tag, next);
+      this.byTag.set(params.artifactId, next);
       return next;
     }
 
     const created: ArtifactValue = {
-      usage: params.usage,
+      format: params.format,
       semantics: params.semantics,
       persistence: "run_only",
+      writeMode: params.writeMode,
       value: params.value,
-      history: [params.value],
+      history,
     };
-    this.byTag.set(params.tag, created);
+    this.byTag.set(params.artifactId, created);
     return created;
   }
 }
diff --git a/server/src/services/chat-generation-v3/contracts.test.ts b/server/src/services/chat-generation-v3/contracts.test.ts
index b24c68cf..aae6b44c 100644
--- a/server/src/services/chat-generation-v3/contracts.test.ts
+++ b/server/src/services/chat-generation-v3/contracts.test.ts
@@ -1,74 +1,92 @@
 import { describe, expect, test } from "vitest";
 
-import { mapOperationOutputToEffectType } from "./contracts";
+import { getArtifactPrimaryEffectType, mapArtifactExposureToEffectTypes } from "./contracts";
 
-describe("mapOperationOutputToEffectType", () => {
-  test("maps artifacts output", () => {
+describe("artifact exposure mapping", () => {
+  test("maps artifact-only config", () => {
     expect(
-      mapOperationOutputToEffectType({
-        type: "artifacts",
-        writeArtifact: {
-          tag: "x",
-          persistence: "run_only",
-          usage: "internal",
-          semantics: "intermediate",
-        },
+      getArtifactPrimaryEffectType({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [],
       })
     ).toBe("artifact.upsert");
   });
 
-  test("maps turn canonicalization output for both targets", () => {
+  test("maps turn rewrite exposures for both targets", () => {
     expect(
-      mapOperationOutputToEffectType({
-        type: "turn_canonicalization",
-        canonicalization: {
-          kind: "replace_text",
-          target: "assistant",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [{ type: "turn_rewrite", target: "assistant_output_main", mode: "replace" }],
       })
-    ).toBe("turn.assistant.replace_text");
+    ).toEqual(["artifact.upsert", "turn.assistant.replace_text"]);
 
     expect(
-      mapOperationOutputToEffectType({
-        type: "turn_canonicalization",
-        canonicalization: {
-          kind: "replace_text",
-          target: "user",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [{ type: "turn_rewrite", target: "current_user_main", mode: "replace" }],
       })
-    ).toBe("turn.user.replace_text");
+    ).toEqual(["artifact.upsert", "turn.user.replace_text"]);
   });
 
-  test("maps prompt_time output kinds", () => {
+  test("maps prompt and ui exposure kinds", () => {
     expect(
-      mapOperationOutputToEffectType({
-        type: "prompt_time",
-        promptTime: {
-          kind: "system_update",
-          mode: "append",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [{ type: "prompt_part", target: "system", mode: "append" }],
       })
-    ).toBe("prompt.system_update");
+    ).toEqual(["artifact.upsert", "prompt.system_update"]);
 
     expect(
-      mapOperationOutputToEffectType({
-        type: "prompt_time",
-        promptTime: {
-          kind: "append_after_last_user",
-          role: "system",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [{ type: "prompt_message", role: "system", anchor: "after_last_user" }],
       })
-    ).toBe("prompt.append_after_last_user");
+    ).toEqual(["artifact.upsert", "prompt.append_after_last_user"]);
 
     expect(
-      mapOperationOutputToEffectType({
-        type: "prompt_time",
-        promptTime: {
-          kind: "insert_at_depth",
-          depthFromEnd: 1,
-          role: "assistant",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [
+          { type: "prompt_message", role: "assistant", anchor: "depth_from_end", depthFromEnd: 1 },
+          { type: "ui_inline", role: "assistant", anchor: "after_last_user" },
+        ],
       })
-    ).toBe("prompt.insert_at_depth");
+    ).toEqual(["artifact.upsert", "prompt.insert_at_depth", "ui.inline"]);
   });
 });
diff --git a/server/src/services/chat-generation-v3/contracts.ts b/server/src/services/chat-generation-v3/contracts.ts
index 2cc35709..aed4ed12 100644
--- a/server/src/services/chat-generation-v3/contracts.ts
+++ b/server/src/services/chat-generation-v3/contracts.ts
@@ -1,11 +1,12 @@
 import type { GenerateMessage } from "@shared/types/generate";
 import type {
+  ArtifactExposure,
+  ArtifactFormat,
   ArtifactPersistence,
   ArtifactSemantics,
-  ArtifactUsage,
+  OperationArtifactConfig,
   OperationHook,
   OperationInProfile,
-  OperationOutput,
   OperationProfile,
   OperationTrigger,
 } from "@shared/types/operation-profiles";
@@ -33,20 +34,18 @@ export type PromptSnapshotV1 = {
   };
 };
 
-export type RunPersistenceTarget =
-  {
-    mode: "entry_parts";
-    assistantEntryId: string;
-    assistantMainPartId: string;
-    assistantReasoningPartId?: string;
-  };
+export type RunPersistenceTarget = {
+  mode: "entry_parts";
+  assistantEntryId: string;
+  assistantMainPartId: string;
+  assistantReasoningPartId?: string;
+};
 
-export type UserTurnTarget =
-  {
-    mode: "entry_parts";
-    userEntryId: string;
-    userMainPartId: string;
-  };
+export type UserTurnTarget = {
+  mode: "entry_parts";
+  userEntryId: string;
+  userMainPartId: string;
+};
 
 export type RunRequest = {
   requestId?: string;
@@ -99,11 +98,12 @@ export type RunContext = {
 };
 
 export type ArtifactValue = {
-  usage: ArtifactUsage;
+  format: ArtifactFormat;
   semantics: ArtifactSemantics;
   persistence: ArtifactPersistence;
-  value: string;
-  history: string[];
+  writeMode: "replace" | "append";
+  value: unknown;
+  history: unknown[];
 };
 
 export type PromptBuildOutput = {
@@ -141,11 +141,16 @@ export type RuntimeEffect =
   | {
       type: "artifact.upsert";
       opId: string;
-      tag: string;
+      artifactId: string;
+      format: ArtifactFormat;
       persistence: ArtifactPersistence;
-      usage: ArtifactUsage;
+      writeMode: "replace" | "append";
+      history: {
+        enabled: boolean;
+        maxItems: number;
+      };
       semantics: ArtifactSemantics;
-      value: string;
+      value: unknown;
     }
   | {
       type: "turn.user.replace_text";
@@ -156,6 +161,16 @@ export type RuntimeEffect =
       type: "turn.assistant.replace_text";
       opId: string;
       text: string;
+    }
+  | {
+      type: "ui.inline";
+      opId: string;
+      role: PromptDraftRole;
+      anchor: "after_last_user" | "depth_from_end";
+      depthFromEnd?: number;
+      payload: unknown;
+      format: ArtifactFormat;
+      source?: string;
     };
 
 export type OperationExecutionStatus = "done" | "skipped" | "error" | "aborted";
@@ -446,19 +461,102 @@ export type RunEvent =
           now: string;
           promptSystem: string;
           messages: Array<{ role: PromptDraftRole; content: string }>;
-          art: Record<string, { value: string; history: string[] }>;
+          art: Record<string, { value: unknown; history: unknown[] }>;
+          artByOpId?: Record<string, { value: unknown; history: unknown[] }>;
         };
       };
     };
 
-export function mapOperationOutputToEffectType(output: OperationOutput): RuntimeEffect["type"] {
-  if (output.type === "artifacts") return "artifact.upsert";
-  if (output.type === "turn_canonicalization") {
-    return output.canonicalization.target === "assistant"
-      ? "turn.assistant.replace_text"
-      : "turn.user.replace_text";
+function valueToText(value: unknown): string {
+  return typeof value === "string" ? value : JSON.stringify(value);
+}
+
+export function mapArtifactExposureToEffectTypes(
+  artifact: OperationArtifactConfig
+): RuntimeEffect["type"][] {
+  const effectTypes: RuntimeEffect["type"][] = ["artifact.upsert"];
+  for (const exposure of artifact.exposures) {
+    if (exposure.type === "prompt_part") {
+      effectTypes.push("prompt.system_update");
+      continue;
+    }
+    if (exposure.type === "prompt_message") {
+      effectTypes.push(
+        exposure.anchor === "after_last_user"
+          ? "prompt.append_after_last_user"
+          : "prompt.insert_at_depth"
+      );
+      continue;
+    }
+    if (exposure.type === "turn_rewrite") {
+      effectTypes.push(
+        exposure.target === "assistant_output_main"
+          ? "turn.assistant.replace_text"
+          : "turn.user.replace_text"
+      );
+      continue;
+    }
+    effectTypes.push("ui.inline");
   }
-  if (output.promptTime.kind === "system_update") return "prompt.system_update";
-  if (output.promptTime.kind === "append_after_last_user") return "prompt.append_after_last_user";
-  return "prompt.insert_at_depth";
+  return effectTypes;
+}
+
+export function getArtifactPrimaryEffectType(
+  artifact: OperationArtifactConfig
+): RuntimeEffect["type"] {
+  return mapArtifactExposureToEffectTypes(artifact)[0] ?? "artifact.upsert";
 }
+
+export function compileArtifactExposureEffect(params: {
+  opId: string;
+  artifact: OperationArtifactConfig;
+  exposure: ArtifactExposure;
+  value: unknown;
+}): RuntimeEffect {
+  const { opId, artifact, exposure, value } = params;
+  if (exposure.type === "prompt_part") {
+    return {
+      type: "prompt.system_update",
+      opId,
+      mode: exposure.mode,
+      payload: valueToText(value),
+      source: exposure.source,
+    };
+  }
+  if (exposure.type === "prompt_message") {
+    if (exposure.anchor === "after_last_user") {
+      return {
+        type: "prompt.append_after_last_user",
+        opId,
+        role: exposure.role,
+        payload: valueToText(value),
+        source: exposure.source,
+      };
+    }
+    return {
+      type: "prompt.insert_at_depth",
+      opId,
+      role: exposure.role,
+      depthFromEnd: exposure.depthFromEnd,
+      payload: valueToText(value),
+      source: exposure.source,
+    };
+  }
+  if (exposure.type === "turn_rewrite") {
+    const text = valueToText(value);
+    return exposure.target === "assistant_output_main"
+      ? { type: "turn.assistant.replace_text", opId, text }
+      : { type: "turn.user.replace_text", opId, text };
+  }
+  return {
+    type: "ui.inline",
+    opId,
+    role: exposure.role,
+    anchor: exposure.anchor,
+    depthFromEnd: exposure.anchor === "depth_from_end" ? exposure.depthFromEnd : undefined,
+    payload: value,
+    format: artifact.format,
+    source: exposure.source,
+  };
+}
+
diff --git a/server/src/services/chat-generation-v3/operations/commit-effects-phase.test.ts b/server/src/services/chat-generation-v3/operations/commit-effects-phase.test.ts
index db14017f..77e56c61 100644
--- a/server/src/services/chat-generation-v3/operations/commit-effects-phase.test.ts
+++ b/server/src/services/chat-generation-v3/operations/commit-effects-phase.test.ts
@@ -509,9 +509,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "artifact-1",
-            tag: "memory",
+            artifactId: "memory",
+            format: "markdown",
             persistence: "run_only",
-            usage: "internal",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "intermediate",
             value: "v1",
           },
@@ -526,9 +528,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "artifact-2",
-            tag: "memory",
+            artifactId: "memory",
+            format: "markdown",
             persistence: "run_only",
-            usage: "internal",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "intermediate",
             value: "v2",
           },
@@ -568,9 +572,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "persisted",
-            tag: "state",
+            artifactId: "state",
+            format: "markdown",
             persistence: "persisted",
-            usage: "prompt+ui",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "state",
             value: "v",
           },
@@ -632,9 +638,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "skip",
-            tag: "x",
+            artifactId: "x",
+            format: "markdown",
             persistence: "run_only",
-            usage: "internal",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "intermediate",
             value: "v",
           },
@@ -719,9 +727,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "c",
-            tag: "x",
+            artifactId: "x",
+            format: "markdown",
             persistence: "persisted",
-            usage: "internal",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "intermediate",
             value: "v",
           },
diff --git a/server/src/services/chat-generation-v3/operations/commit-effects-phase.ts b/server/src/services/chat-generation-v3/operations/commit-effects-phase.ts
index 4b4e0118..d763833f 100644
--- a/server/src/services/chat-generation-v3/operations/commit-effects-phase.ts
+++ b/server/src/services/chat-generation-v3/operations/commit-effects-phase.ts
@@ -4,12 +4,14 @@ import { type RunArtifactStore } from "../artifacts/run-artifact-store";
 import { applyArtifactEffect } from "./effect-handlers/artifact-effects";
 import { applyPromptEffect } from "./effect-handlers/prompt-effects";
 import { persistUserTurnText } from "./effect-handlers/turn-effects";
+import { persistUiInlineEffect } from "./effect-handlers/ui-effects";
 import { validateEffectForHook } from "./effect-policy";
 
 import type {
   CommitPhaseReport,
   OperationExecutionResult,
   RuntimeEffect,
+  RunPersistenceTarget,
   RunState,
   TurnUserCanonicalizationRecord,
   UserTurnTarget,
@@ -104,6 +106,7 @@ export async function commitEffectsPhase(params: {
   sessionKey: string | null;
   runState: RunState;
   runArtifactStore: RunArtifactStore;
+  persistenceTarget?: RunPersistenceTarget;
   userTurnTarget?: UserTurnTarget;
   onUserTurnCanonicalized?: (payload: TurnUserCanonicalizationRecord) => void;
   onCommitEvent?: (event: {
@@ -174,7 +177,7 @@ export async function commitEffectsPhase(params: {
             effect,
           });
           if (applied.persistence === "persisted") {
-            params.runState.persistedArtifactsSnapshot[effect.tag] = applied;
+            params.runState.persistedArtifactsSnapshot[effect.artifactId] = applied;
           }
           effectsReport.push({
             opId: opResult.opId,
@@ -188,6 +191,31 @@ export async function commitEffectsPhase(params: {
           continue;
         }
 
+        if (effect.type === "ui.inline") {
+          if (!params.persistenceTarget) {
+            throw new Error("UI inline effect requires persistence target");
+          }
+          await persistUiInlineEffect({
+            ownerId: params.ownerId,
+            chatId: params.chatId,
+            branchId: params.branchId,
+            hook: params.hook,
+            effect,
+            persistenceTarget: params.persistenceTarget,
+            userTurnTarget: currentUserTurnTarget,
+          });
+          effectsReport.push({
+            opId: opResult.opId,
+            effectType: effect.type,
+            status: "applied",
+          });
+          params.onCommitEvent?.({
+            type: "commit.effect_applied",
+            data: { hook: params.hook, opId: opResult.opId, effectType: effect.type },
+          });
+          continue;
+        }
+
         if (effect.type === "turn.user.replace_text") {
           const persisted = await persistUserTurnText({
             target: currentUserTurnTarget,
diff --git a/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.test.ts b/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.test.ts
index f13c3289..2ecf8c1e 100644
--- a/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.test.ts
+++ b/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.test.ts
@@ -17,18 +17,21 @@ describe("applyArtifactEffect", () => {
       profile: null,
       runStore: store,
       effect: {
-        tag: "tmp",
+        artifactId: "tmp",
+        format: "markdown",
         persistence: "run_only",
-        usage: "internal",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
         semantics: "intermediate",
         value: "v1",
       },
     });
 
     expect(out).toEqual({
-      usage: "internal",
+      format: "markdown",
       semantics: "intermediate",
       persistence: "run_only",
+      writeMode: "replace",
       value: "v1",
       history: ["v1"],
     });
@@ -45,9 +48,11 @@ describe("applyArtifactEffect", () => {
         profile: null,
         runStore: new RunArtifactStore(),
         effect: {
-          tag: "state",
+          artifactId: "state",
+          format: "markdown",
           persistence: "persisted",
-          usage: "prompt+ui",
+          writeMode: "replace",
+          history: { enabled: true, maxItems: 20 },
           semantics: "state",
           value: "v",
         },
@@ -57,9 +62,10 @@ describe("applyArtifactEffect", () => {
 
   test("delegates persisted write to ProfileSessionArtifactStore.upsert", async () => {
     const upsertSpy = vi.spyOn(ProfileSessionArtifactStore, "upsert").mockResolvedValue({
-      usage: "prompt+ui",
+      format: "json",
       semantics: "state",
       persistence: "persisted",
+      writeMode: "append",
       value: "persisted-v",
       history: ["persisted-v"],
     });
@@ -85,9 +91,11 @@ describe("applyArtifactEffect", () => {
       },
       runStore: new RunArtifactStore(),
       effect: {
-        tag: "world_state",
+        artifactId: "world_state",
+        format: "json",
         persistence: "persisted",
-        usage: "prompt+ui",
+        writeMode: "append",
+        history: { enabled: true, maxItems: 20 },
         semantics: "state",
         value: "persisted-v",
       },
@@ -98,15 +106,17 @@ describe("applyArtifactEffect", () => {
         ownerId: "global",
         sessionKey: "sess-1",
         tag: "world_state",
-        usage: "prompt+ui",
+        format: "json",
         semantics: "state",
+        writeMode: "append",
         value: "persisted-v",
       })
     );
     expect(out).toEqual({
-      usage: "prompt+ui",
+      format: "json",
       semantics: "state",
       persistence: "persisted",
+      writeMode: "append",
       value: "persisted-v",
       history: ["persisted-v"],
     });
diff --git a/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.ts b/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.ts
index a60622ff..6e7c31a8 100644
--- a/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.ts
+++ b/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.ts
@@ -13,18 +13,25 @@ export async function applyArtifactEffect(params: {
   profile: OperationProfile | null;
   runStore: RunArtifactStore;
   effect: {
-    tag: string;
+    artifactId: string;
+    format: "text" | "markdown" | "json";
     persistence: "persisted" | "run_only";
-    usage: string;
+    writeMode: "replace" | "append";
+    history: {
+      enabled: boolean;
+      maxItems: number;
+    };
     semantics: string;
-    value: string;
+    value: unknown;
   };
 }): Promise<ArtifactValue> {
   if (params.effect.persistence === "run_only") {
     return params.runStore.upsert({
-      tag: params.effect.tag,
-      usage: params.effect.usage as any,
+      artifactId: params.effect.artifactId,
+      format: params.effect.format as any,
       semantics: params.effect.semantics as any,
+      writeMode: params.effect.writeMode as any,
+      history: params.effect.history,
       value: params.effect.value,
     });
   }
@@ -39,9 +46,11 @@ export async function applyArtifactEffect(params: {
     chatId: params.chatId,
     branchId: params.branchId,
     profile: params.profile,
-    tag: params.effect.tag,
-    usage: params.effect.usage as any,
+    tag: params.effect.artifactId,
+    format: params.effect.format as any,
     semantics: params.effect.semantics as any,
+    writeMode: params.effect.writeMode as any,
+    history: params.effect.history,
     value: params.effect.value,
   });
   return persisted;
diff --git a/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.test.ts b/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.test.ts
new file mode 100644
index 00000000..d12e2c67
--- /dev/null
+++ b/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.test.ts
@@ -0,0 +1,222 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  getBranchCurrentTurn: vi.fn(),
+  listEntriesWithActiveVariants: vi.fn(),
+  getEntryById: vi.fn(),
+  getActiveVariantWithParts: vi.fn(),
+  getPartWithVariantContextById: vi.fn(),
+  createPart: vi.fn(),
+}));
+
+vi.mock("../../../chat-entry-parts/branch-turn-repository", () => ({
+  getBranchCurrentTurn: mocks.getBranchCurrentTurn,
+}));
+
+vi.mock("../../../chat-entry-parts/entries-repository", () => ({
+  listEntriesWithActiveVariants: mocks.listEntriesWithActiveVariants,
+  getEntryById: mocks.getEntryById,
+  getActiveVariantWithParts: mocks.getActiveVariantWithParts,
+}));
+
+vi.mock("../../../chat-entry-parts/parts-repository", () => ({
+  getPartWithVariantContextById: mocks.getPartWithVariantContextById,
+  createPart: mocks.createPart,
+}));
+
+import { persistUiInlineEffect } from "./ui-effects";
+
+describe("persistUiInlineEffect", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.getBranchCurrentTurn.mockResolvedValue(7);
+    mocks.listEntriesWithActiveVariants.mockResolvedValue([]);
+    mocks.getEntryById.mockResolvedValue({
+      entryId: "user-entry-current",
+      chatId: "chat-1",
+      branchId: "branch-1",
+      role: "user",
+      createdAt: 100,
+      activeVariantId: "variant-current",
+    });
+    mocks.getActiveVariantWithParts.mockResolvedValue({
+      variantId: "variant-current",
+      entryId: "user-entry-current",
+      kind: "generation",
+      createdAt: 100,
+      parts: [
+        {
+          partId: "user-main-current",
+          channel: "main",
+          order: 10,
+          payload: "hello",
+          payloadFormat: "markdown",
+          visibility: { ui: "always", prompt: true },
+          prompt: { serializerId: "asText" },
+          ui: { rendererId: "markdown" },
+          lifespan: "infinite",
+          createdTurn: 1,
+          source: "user",
+        },
+      ],
+    });
+    mocks.getPartWithVariantContextById.mockResolvedValue({
+      entryId: "user-entry-current",
+      variantId: "variant-current",
+      part: {
+        partId: "user-main-current",
+        channel: "main",
+        order: 10,
+        payload: "hello",
+        payloadFormat: "markdown",
+        visibility: { ui: "always", prompt: true },
+        prompt: { serializerId: "asText" },
+        ui: { rendererId: "markdown" },
+        lifespan: "infinite",
+        createdTurn: 1,
+        source: "user",
+      },
+    });
+    mocks.createPart.mockResolvedValue({
+      partId: "aux-inline",
+      variantId: "variant-current",
+    });
+  });
+
+  test("attaches inline UI part to current user target for after_last_user anchor", async () => {
+    await persistUiInlineEffect({
+      ownerId: "global",
+      chatId: "chat-1",
+      branchId: "branch-1",
+      hook: "before_main_llm",
+      effect: {
+        type: "ui.inline",
+        opId: "op-inline",
+        role: "user",
+        anchor: "after_last_user",
+        payload: { summary: "note" },
+        format: "json",
+      },
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
+      userTurnTarget: {
+        mode: "entry_parts",
+        userEntryId: "user-entry-current",
+        userMainPartId: "user-main-current",
+      },
+    });
+
+    expect(mocks.createPart).toHaveBeenCalledWith(
+      expect.objectContaining({
+        ownerId: "global",
+        variantId: "variant-current",
+        channel: "aux",
+        order: 20,
+        payload: { summary: "note" },
+        payloadFormat: "json",
+        createdTurn: 7,
+        visibility: { ui: "always", prompt: false },
+        tags: ["artifact_exposure", "ui_inline"],
+      })
+    );
+  });
+
+  test("uses depth_from_end over matching role entries when current target is not applicable", async () => {
+    mocks.listEntriesWithActiveVariants.mockResolvedValue([
+      {
+        entry: {
+          entryId: "assistant-1",
+          chatId: "chat-1",
+          branchId: "branch-1",
+          role: "assistant",
+          createdAt: 10,
+          activeVariantId: "variant-a1",
+        },
+        variant: {
+          variantId: "variant-a1",
+          entryId: "assistant-1",
+          kind: "generation",
+          createdAt: 10,
+          parts: [
+            {
+              partId: "assistant-1-main",
+              channel: "main",
+              order: 10,
+              payload: "a1",
+              payloadFormat: "markdown",
+              visibility: { ui: "always", prompt: true },
+              prompt: { serializerId: "asText" },
+              ui: { rendererId: "markdown" },
+              lifespan: "infinite",
+              createdTurn: 1,
+              source: "llm",
+            },
+          ],
+        },
+      },
+      {
+        entry: {
+          entryId: "assistant-2",
+          chatId: "chat-1",
+          branchId: "branch-1",
+          role: "assistant",
+          createdAt: 20,
+          activeVariantId: "variant-a2",
+        },
+        variant: {
+          variantId: "variant-a2",
+          entryId: "assistant-2",
+          kind: "generation",
+          createdAt: 20,
+          parts: [
+            {
+              partId: "assistant-2-main",
+              channel: "main",
+              order: 10,
+              payload: "a2",
+              payloadFormat: "markdown",
+              visibility: { ui: "always", prompt: true },
+              prompt: { serializerId: "asText" },
+              ui: { rendererId: "markdown" },
+              lifespan: "infinite",
+              createdTurn: 2,
+              source: "llm",
+            },
+          ],
+        },
+      },
+    ]);
+
+    await persistUiInlineEffect({
+      ownerId: "global",
+      chatId: "chat-1",
+      branchId: "branch-1",
+      hook: "before_main_llm",
+      effect: {
+        type: "ui.inline",
+        opId: "op-inline",
+        role: "assistant",
+        anchor: "depth_from_end",
+        depthFromEnd: 1,
+        payload: "older-target",
+        format: "markdown",
+      },
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
+    });
+
+    expect(mocks.createPart).toHaveBeenCalledWith(
+      expect.objectContaining({
+        variantId: "variant-a1",
+        payload: "older-target",
+        payloadFormat: "markdown",
+      })
+    );
+  });
+});
diff --git a/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.ts b/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.ts
new file mode 100644
index 00000000..9fd43fab
--- /dev/null
+++ b/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.ts
@@ -0,0 +1,142 @@
+import { getBranchCurrentTurn } from "../../../chat-entry-parts/branch-turn-repository";
+import { getEntryById, getActiveVariantWithParts, listEntriesWithActiveVariants } from "../../../chat-entry-parts/entries-repository";
+import { createPart, getPartWithVariantContextById } from "../../../chat-entry-parts/parts-repository";
+
+import type { RunPersistenceTarget, RuntimeEffect, UserTurnTarget } from "../../contracts";
+import type { Part } from "@shared/types/chat-entry-parts";
+
+type ResolvedTarget = {
+  entryId: string;
+  variantId: string;
+  parts: Part[];
+};
+
+function compareByTimeAndId(a: { entryId: string; createdAt: number }, b: { entryId: string; createdAt: number }): number {
+  if (a.createdAt !== b.createdAt) return a.createdAt - b.createdAt;
+  return a.entryId.localeCompare(b.entryId);
+}
+
+async function resolveCurrentEntryTarget(partId: string): Promise<ResolvedTarget | null> {
+  const context = await getPartWithVariantContextById({ partId });
+  if (!context) return null;
+  const entry = await getEntryById({ entryId: context.entryId });
+  if (!entry) return null;
+  const variant = await getActiveVariantWithParts({ entry });
+  return {
+    entryId: context.entryId,
+    variantId: context.variantId,
+    parts: variant?.parts ?? [context.part],
+  };
+}
+
+async function resolveUiTarget(params: {
+  chatId: string;
+  branchId: string;
+  hook: "before_main_llm" | "after_main_llm";
+  effect: Extract<RuntimeEffect, { type: "ui.inline" }>;
+  persistenceTarget: RunPersistenceTarget;
+  userTurnTarget?: UserTurnTarget;
+}): Promise<ResolvedTarget | null> {
+  const entries = await listEntriesWithActiveVariants({
+    chatId: params.chatId,
+    branchId: params.branchId,
+    limit: 200,
+  });
+
+  const resolvedCandidates = entries
+    .filter((item) => item.entry.role === params.effect.role && item.variant)
+    .map((item) => ({
+      entryId: item.entry.entryId,
+      createdAt: item.entry.createdAt,
+      variantId: item.variant!.variantId,
+      parts: item.variant!.parts,
+    }))
+    .sort(compareByTimeAndId);
+
+  const maybeCurrentUser =
+    params.effect.role === "user" && params.userTurnTarget
+      ? await resolveCurrentEntryTarget(params.userTurnTarget.userMainPartId)
+      : null;
+  const maybeCurrentAssistant =
+    params.effect.role === "assistant" && params.hook === "after_main_llm"
+      ? await resolveCurrentEntryTarget(params.persistenceTarget.assistantMainPartId)
+      : null;
+
+  const withCurrent = [...resolvedCandidates];
+  if (maybeCurrentUser && !withCurrent.some((item) => item.entryId === maybeCurrentUser.entryId)) {
+    withCurrent.push({ ...maybeCurrentUser, createdAt: Number.MAX_SAFE_INTEGER });
+  }
+  if (maybeCurrentAssistant && !withCurrent.some((item) => item.entryId === maybeCurrentAssistant.entryId)) {
+    withCurrent.push({ ...maybeCurrentAssistant, createdAt: Number.MAX_SAFE_INTEGER });
+  }
+
+  const ordered = withCurrent.sort(compareByTimeAndId);
+  if (ordered.length === 0) return null;
+
+  if (params.effect.anchor === "after_last_user") {
+    if (params.effect.role === "user" && maybeCurrentUser) return maybeCurrentUser;
+    if (params.effect.role === "assistant" && maybeCurrentAssistant) return maybeCurrentAssistant;
+    const last = ordered[ordered.length - 1];
+    return last
+      ? {
+          entryId: last.entryId,
+          variantId: last.variantId,
+          parts: last.parts,
+        }
+      : null;
+  }
+
+  const depth = Math.max(0, Math.floor(params.effect.depthFromEnd ?? 0));
+  const target = ordered[ordered.length - 1 - depth];
+  if (!target) return null;
+  return {
+    entryId: target.entryId,
+    variantId: target.variantId,
+    parts: target.parts,
+  };
+}
+
+function resolveNextOrder(parts: Part[]): number {
+  const maxOrder = parts.reduce((max, part) => Math.max(max, part.order), 0);
+  return maxOrder + 10;
+}
+
+function normalizePartPayload(value: unknown): string | number | boolean | object | null {
+  if (value === null) return null;
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value;
+  }
+  if (typeof value === "object") return value;
+  return String(value ?? "");
+}
+
+export async function persistUiInlineEffect(params: {
+  ownerId: string;
+  chatId: string;
+  branchId: string;
+  hook: "before_main_llm" | "after_main_llm";
+  effect: Extract<RuntimeEffect, { type: "ui.inline" }>;
+  persistenceTarget: RunPersistenceTarget;
+  userTurnTarget?: UserTurnTarget;
+}): Promise<void> {
+  const target = await resolveUiTarget(params);
+  if (!target) return;
+
+  const currentTurn = await getBranchCurrentTurn({ branchId: params.branchId });
+  await createPart({
+    ownerId: params.ownerId,
+    variantId: target.variantId,
+    channel: "aux",
+    order: resolveNextOrder(target.parts),
+    payload: normalizePartPayload(params.effect.payload),
+    payloadFormat: params.effect.format,
+    visibility: {
+      ui: "always",
+      prompt: false,
+    },
+    lifespan: "infinite",
+    source: "agent",
+    createdTurn: currentTurn,
+    tags: ["artifact_exposure", "ui_inline"],
+  });
+}
diff --git a/server/src/services/chat-generation-v3/operations/effect-policy.test.ts b/server/src/services/chat-generation-v3/operations/effect-policy.test.ts
index f5605a76..785a3f87 100644
--- a/server/src/services/chat-generation-v3/operations/effect-policy.test.ts
+++ b/server/src/services/chat-generation-v3/operations/effect-policy.test.ts
@@ -34,9 +34,11 @@ describe("effect policy", () => {
       effect: {
         type: "artifact.upsert",
         opId: "op",
-        tag: "x",
+        artifactId: "artifact:x",
+        format: "markdown",
         persistence: "run_only",
-        usage: "internal",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
         semantics: "intermediate",
         value: "v",
       },
@@ -46,9 +48,11 @@ describe("effect policy", () => {
       effect: {
         type: "artifact.upsert",
         opId: "op",
-        tag: "x",
+        artifactId: "artifact:x",
+        format: "markdown",
         persistence: "run_only",
-        usage: "internal",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
         semantics: "intermediate",
         value: "v",
       },
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
index 607663e6..e0f20d43 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
@@ -3,7 +3,11 @@ import { beforeEach, describe, expect, test, vi } from "vitest";
 import { executeOperationsPhase } from "./execute-operations-phase";
 
 import type { InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
-import type { OperationInProfile, OperationOutput } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationInProfile,
+} from "@shared/types/operation-profiles";
 
 
 const mocks = vi.hoisted(() => ({
@@ -31,6 +35,24 @@ vi.mock("../../llm/llm-gateway-adapter", () => ({
 type TemplateOp = Extract<OperationInProfile, { kind: "template" }>;
 type LlmOp = Extract<OperationInProfile, { kind: "llm" }>;
 
+function toArtifact(params: {
+  opId: string;
+  kind: "template" | "llm" | "compute";
+  title: string;
+  output: LegacyOperationOutput;
+  llmOutputMode?: "text" | "json";
+}) {
+  return normalizeOperationArtifactConfig({
+    opId: params.opId,
+    kind: params.kind,
+    title: params.title,
+    rawParams: {
+      output: params.output,
+      ...(params.llmOutputMode ? { params: { outputMode: params.llmOutputMode } } : {}),
+    },
+  });
+}
+
 function streamOf(
   events: Array<
     | { type: "delta"; text: string }
@@ -62,7 +84,7 @@ function makeLlmOp(params: {
   opId: string;
   order: number;
   prompt: string;
-  output: OperationOutput;
+  output: LegacyOperationOutput;
   hooks?: LlmOp["config"]["hooks"];
   dependsOn?: string[];
   outputMode?: "text" | "json";
@@ -99,13 +121,19 @@ function makeLlmOp(params: {
           timeoutMs: params.timeoutMs,
           retry: params.retry,
         },
-        output: params.output,
+        artifact: toArtifact({
+          opId: params.opId,
+          kind: "llm",
+          title: params.opId,
+          output: params.output,
+          llmOutputMode: params.outputMode,
+        }),
       },
     },
   };
 }
 
-function artifactOutput(tag: string): OperationOutput {
+function artifactOutput(tag: string): LegacyOperationOutput {
   return {
     type: "artifacts",
     writeArtifact: {
@@ -121,7 +149,7 @@ function makeTemplateOp(params: {
   opId: string;
   order: number;
   template: string;
-  output: OperationOutput;
+  output: LegacyOperationOutput;
   hooks?: TemplateOp["config"]["hooks"];
   dependsOn?: string[];
   required?: boolean;
@@ -142,7 +170,12 @@ function makeTemplateOp(params: {
       params: {
         template: params.template,
         strictVariables: params.strictVariables,
-        output: params.output,
+        artifact: toArtifact({
+          opId: params.opId,
+          kind: "template",
+          title: params.opId,
+          output: params.output,
+        }),
       },
     },
   };
@@ -164,8 +197,13 @@ function makeComputeOp(params: {
       triggers: ["generate", "regenerate"],
       order: params.order,
       params: {
-        params: { noop: true },
-        output: artifactOutput(`compute_${params.opId}`),
+        params: { noop: true } as Record<string, unknown>,
+        artifact: toArtifact({
+          opId: params.opId,
+          kind: "compute",
+          title: params.opId,
+          output: artifactOutput(`compute_${params.opId}`),
+        }),
       },
     },
   };
@@ -293,7 +331,7 @@ describe("executeOperationsPhase", () => {
     expect(out[0]?.effects[0]).toMatchObject({
       type: "artifact.upsert",
       opId: "a",
-      tag: "greeting",
+      artifactId: "greeting",
       value: "hello",
     });
   });
@@ -335,7 +373,7 @@ describe("executeOperationsPhase", () => {
     expect(finished?.status).toBe("done");
     expect(finished?.result?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "greeting",
+      artifactId: "greeting",
       value: "hello",
     });
     expect(finished?.result?.debugSummary).toBe("artifact.upsert:5");
@@ -373,7 +411,7 @@ describe("executeOperationsPhase", () => {
     expect(byId.get("b")?.status).toBe("done");
     expect(byId.get("b")?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "seen",
+      artifactId: "seen",
       value: "seen=alpha",
     });
   });
@@ -423,7 +461,7 @@ describe("executeOperationsPhase", () => {
     expect(joined?.status).toBe("done");
     expect(joined?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "joined",
+      artifactId: "joined",
       value: "root-L|root-R",
     });
   });
@@ -458,7 +496,7 @@ describe("executeOperationsPhase", () => {
     expect(b?.status).toBe("done");
     expect(b?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "b",
+      artifactId: "b",
       value: "none",
     });
   });
@@ -644,7 +682,7 @@ describe("executeOperationsPhase", () => {
       templateContext: makeTemplateContext(),
     });
 
-    const effectTypes = out.map((r) => r.effects[0]?.type);
+    const effectTypes = out.map((r) => r.effects[1]?.type);
     expect(effectTypes).toEqual([
       "prompt.system_update",
       "prompt.append_after_last_user",
@@ -659,6 +697,7 @@ describe("executeOperationsPhase", () => {
         promptSystem: string;
         messages: Array<{ role: "system" | "user" | "assistant"; content: string }>;
         art: Record<string, { value: string; history: string[] }>;
+        artByOpId?: Record<string, { value: string; history: string[] }>;
       };
       rendered: string;
     }>();
@@ -708,7 +747,7 @@ describe("executeOperationsPhase", () => {
     const bResult = out.find((r) => r.opId === "b");
     expect(bResult?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "seen",
+      artifactId: "seen",
       value: "PROMPT|NOTE",
     });
 
@@ -717,6 +756,7 @@ describe("executeOperationsPhase", () => {
     expect(bDebug?.liquidContext.promptSystem).toBe("sys\n\nPROMPT");
     expect(bDebug?.liquidContext.messages[2]).toEqual({ role: "system", content: "PROMPT" });
     expect(bDebug?.liquidContext.art.note?.value).toBe("NOTE");
+    expect(bDebug?.liquidContext.artByOpId?.c?.value).toBe("NOTE");
   });
 
   test("exposes promptSystem to template operations with dependency replay", async () => {
@@ -752,7 +792,7 @@ describe("executeOperationsPhase", () => {
     const byId = new Map(out.map((item) => [item.opId, item] as const));
     expect(byId.get("read-system")?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "seen",
+      artifactId: "seen",
       value: "NEW_SYS",
     });
   });
@@ -823,7 +863,7 @@ describe("executeOperationsPhase", () => {
     });
     expect(out[0]?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "llm_tag",
+      artifactId: "llm_tag",
       value: "LLM RESULT",
     });
   });
@@ -859,7 +899,7 @@ describe("executeOperationsPhase", () => {
     expect(out[0]?.status).toBe("done");
     expect(out[0]?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "llm_json",
+      artifactId: "llm_json",
       value: '{"alpha":1,"beta":[2,3]}',
     });
   });
@@ -1156,7 +1196,7 @@ describe("executeOperationsPhase", () => {
     expect(out[0]?.status).toBe("done");
     expect(out[0]?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "llm_json_schema",
+      artifactId: "llm_json_schema",
     });
   });
 
@@ -1391,3 +1431,4 @@ describe("executeOperationsPhase", () => {
     }
   });
 });
+
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
index 2687bd6a..37247c10 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
@@ -3,7 +3,8 @@ import { runOrchestrator } from "@core/operation-orchestrator";
 
 import { renderLiquidTemplate } from "../../chat-core/prompt-template-renderer";
 import {
-  mapOperationOutputToEffectType,
+  compileArtifactExposureEffect,
+  getArtifactPrimaryEffectType,
   type OperationFinishedEventData,
   type OperationExecutionResult,
   type OperationSkipDetails,
@@ -21,7 +22,7 @@ import type { OperationHook, OperationInProfile, OperationTrigger } from "@share
 
 type PreviewState = {
   messages: PromptDraftMessage[];
-  artifacts: Record<string, { value: string; history: string[] }>;
+  artifacts: Record<string, { value: unknown; history: unknown[] }>;
   assistantText: string;
 };
 
@@ -61,60 +62,6 @@ function clonePreview(state: PreviewState): PreviewState {
   };
 }
 
-function toRuntimeEffect(params: {
-  opId: string;
-  output: OperationInProfile["config"]["params"]["output"];
-  rendered: string;
-}): RuntimeEffect {
-  const { opId, output, rendered } = params;
-  if (output.type === "artifacts") {
-    return {
-      type: "artifact.upsert",
-      opId,
-      tag: output.writeArtifact.tag,
-      persistence: output.writeArtifact.persistence,
-      usage: output.writeArtifact.usage,
-      semantics: output.writeArtifact.semantics,
-      value: rendered,
-    };
-  }
-
-  if (output.type === "turn_canonicalization") {
-    return output.canonicalization.target === "assistant"
-      ? { type: "turn.assistant.replace_text", opId, text: rendered }
-      : { type: "turn.user.replace_text", opId, text: rendered };
-  }
-
-  if (output.promptTime.kind === "system_update") {
-    return {
-      type: "prompt.system_update",
-      opId,
-      mode: output.promptTime.mode,
-      payload: rendered,
-      source: output.promptTime.source,
-    };
-  }
-
-  if (output.promptTime.kind === "append_after_last_user") {
-    return {
-      type: "prompt.append_after_last_user",
-      opId,
-      role: normalizePromptTimeRole(output.promptTime.role),
-      payload: rendered,
-      source: output.promptTime.source,
-    };
-  }
-
-  return {
-    type: "prompt.insert_at_depth",
-    opId,
-    role: normalizePromptTimeRole(output.promptTime.role),
-    depthFromEnd: normalizeDepthFromEnd(output.promptTime.depthFromEnd),
-    payload: rendered,
-    source: output.promptTime.source,
-  };
-}
-
 function applyEffectToPreview(state: PreviewState, effect: RuntimeEffect): PreviewState {
   if (
     effect.type === "prompt.system_update" ||
@@ -125,13 +72,16 @@ function applyEffectToPreview(state: PreviewState, effect: RuntimeEffect): Previ
   }
 
   if (effect.type === "artifact.upsert") {
-    const existing = state.artifacts[effect.tag];
-    const history = [...(existing?.history ?? []), effect.value];
+    const existing = state.artifacts[effect.artifactId];
+    const nextHistory = [...(existing?.history ?? []), effect.value];
+    const history = effect.history.enabled
+      ? nextHistory.slice(-effect.history.maxItems)
+      : [];
     return {
       ...state,
       artifacts: {
         ...state.artifacts,
-        [effect.tag]: {
+        [effect.artifactId]: {
           value: effect.value,
           history,
         },
@@ -148,6 +98,7 @@ function applyEffectToPreview(state: PreviewState, effect: RuntimeEffect): Previ
 
   const lastUserIdx = state.messages.map((m) => m.role).lastIndexOf("user");
   if (lastUserIdx < 0) return state;
+  if (effect.type === "ui.inline") return state;
   const nextMessages = state.messages.map((m, idx) =>
     idx === lastUserIdx ? { role: "user" as const, content: effect.text } : { ...m }
   );
@@ -169,15 +120,50 @@ function replayDependencyEffects(
   return state;
 }
 
-function buildTemplateContext(base: InstructionRenderContext, state: PreviewState): InstructionRenderContext {
+function mapArtifactsByOpId(
+  operations: OperationInProfile[],
+  artifacts: Record<string, { value: unknown; history: unknown[] }>
+): Record<string, { value: unknown; history: unknown[] }> {
+  const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
+  for (const op of operations) {
+    const artifact = artifacts[op.config.params.artifact.artifactId];
+    if (!artifact) continue;
+    mapped[op.opId] = { value: artifact.value, history: [...artifact.history] };
+  }
+  return mapped;
+}
+
+function mapArtifactsForTemplate(
+  operations: OperationInProfile[],
+  artifacts: Record<string, { value: unknown; history: unknown[] }>
+): Record<string, { value: unknown; history: unknown[] }> {
+  const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
+  for (const op of operations) {
+    const artifact = artifacts[op.config.params.artifact.artifactId];
+    if (!artifact) continue;
+    const snapshot = { value: artifact.value, history: [...artifact.history] };
+    mapped[op.config.params.artifact.tag] = snapshot;
+    mapped[op.config.params.artifact.artifactId] = snapshot;
+  }
+  return mapped;
+}
+
+function buildTemplateContext(
+  base: InstructionRenderContext,
+  state: PreviewState,
+  operations: OperationInProfile[]
+): InstructionRenderContext {
+  const art = {
+    ...(base.art ?? {}),
+    ...mapArtifactsForTemplate(operations, state.artifacts),
+  };
   return {
     ...base,
     promptSystem: resolvePromptSystem(state.messages),
-    art: {
-      ...(base.art ?? {}),
-      ...Object.fromEntries(
-        Object.entries(state.artifacts).map(([tag, value]) => [tag, { value: value.value, history: value.history }])
-      ),
+    art,
+    artByOpId: {
+      ...(base.artByOpId ?? {}),
+      ...mapArtifactsByOpId(operations, state.artifacts),
     },
     messages: state.messages.map((m) => ({ role: m.role, content: m.content })),
   };
@@ -186,7 +172,8 @@ function buildTemplateContext(base: InstructionRenderContext, state: PreviewStat
 function buildLiquidContextSnapshot(params: {
   base: InstructionRenderContext;
   state: PreviewState;
-}): {
+  operations: OperationInProfile[];
+  }): {
   char: unknown;
   user: unknown;
   chat: unknown;
@@ -194,7 +181,8 @@ function buildLiquidContextSnapshot(params: {
   now: string;
   promptSystem: string;
   messages: Array<{ role: PromptDraftMessage["role"]; content: string }>;
-  art: Record<string, { value: string; history: string[] }>;
+  art: Record<string, { value: unknown; history: unknown[] }>;
+  artByOpId?: Record<string, { value: unknown; history: unknown[] }>;
 } {
   return {
     char: params.base.char ?? {},
@@ -204,15 +192,10 @@ function buildLiquidContextSnapshot(params: {
     now: params.base.now,
     promptSystem: resolvePromptSystem(params.state.messages),
     messages: params.state.messages.map((m) => ({ role: m.role, content: m.content })),
-    art: Object.fromEntries(
-      Object.entries(params.state.artifacts).map(([tag, value]) => [
-        tag,
-        { value: value.value, history: [...value.history] },
-      ])
-    ),
+    art: mapArtifactsForTemplate(params.operations, params.state.artifacts),
+    artByOpId: params.base.artByOpId as Record<string, { value: unknown; history: unknown[] }> | undefined,
   };
 }
-
 function normalizeBlockedByOpIds(input: string[] | undefined): string[] {
   if (!input || input.length === 0) return [];
   return Array.from(new Set(input)).sort((a, b) => a.localeCompare(b));
@@ -362,7 +345,7 @@ export async function executeOperationsPhase(params: {
   >;
   executionMode: "concurrent" | "sequential";
   baseMessages: PromptDraftMessage[];
-  baseArtifacts: Record<string, { value: string; history: string[] }>;
+  baseArtifacts: Record<string, { value: unknown; history: unknown[] }>;
   assistantText: string;
   templateContext: InstructionRenderContext;
   abortSignal?: AbortSignal;
@@ -383,7 +366,8 @@ export async function executeOperationsPhase(params: {
       now: string;
       promptSystem: string;
       messages: Array<{ role: PromptDraftMessage["role"]; content: string }>;
-      art: Record<string, { value: string; history: string[] }>;
+      art: Record<string, { value: unknown; history: unknown[] }>;
+      artByOpId?: Record<string, { value: unknown; history: unknown[] }>;
     };
   }) => void;
 }): Promise<OperationExecutionResult[]> {
@@ -477,7 +461,7 @@ export async function executeOperationsPhase(params: {
           dependsOn: op.config.dependsOn,
           run: async () => {
             const depPreview = replayDependencyEffects(baseState, op.config.dependsOn ?? [], effectsByOpId);
-            const liquidContext = buildTemplateContext(params.templateContext, depPreview);
+            const liquidContext = buildTemplateContext(params.templateContext, depPreview, params.operations);
             let resolvedRendered = "";
             let debugSummary: string | undefined;
 
@@ -501,11 +485,29 @@ export async function executeOperationsPhase(params: {
               debugSummary = llmResult.debugSummary;
             }
 
-            const effect = toRuntimeEffect({
-              opId: op.opId,
-              output: op.config.params.output,
-              rendered: resolvedRendered,
-            });
+            const artifact = op.config.params.artifact;
+            const effects: RuntimeEffect[] = [
+              {
+                type: "artifact.upsert",
+                opId: op.opId,
+                artifactId: artifact.artifactId,
+                format: artifact.format,
+                persistence: artifact.persistence,
+                writeMode: artifact.writeMode,
+                history: artifact.history,
+                semantics: artifact.semantics ?? "intermediate",
+                value: resolvedRendered,
+              },
+              ...artifact.exposures.map((exposure) =>
+                compileArtifactExposureEffect({
+                  opId: op.opId,
+                  artifact,
+                  exposure,
+                  value: resolvedRendered,
+                })
+              ),
+            ];
+            const effect = effects[0];
             if (op.kind === "template") {
               params.onTemplateDebug?.({
                 hook: params.hook,
@@ -517,22 +519,22 @@ export async function executeOperationsPhase(params: {
                 liquidContext: buildLiquidContextSnapshot({
                   base: liquidContext,
                   state: depPreview,
+                  operations: params.operations,
                 }),
               });
             }
-            const effects: RuntimeEffect[] = [effect];
             effectsByOpId.set(op.opId, effects);
             taskResultByOpId.set(op.opId, {
               effects,
               debugSummary:
                 debugSummary ??
-                `${mapOperationOutputToEffectType(op.config.params.output)}:${resolvedRendered.length}`,
+                `${getArtifactPrimaryEffectType(op.config.params.artifact)}:${resolvedRendered.length}`,
             });
             return {
               effects,
               debugSummary:
                 debugSummary ??
-                `${mapOperationOutputToEffectType(op.config.params.output)}:${resolvedRendered.length}`,
+                `${getArtifactPrimaryEffectType(op.config.params.artifact)}:${resolvedRendered.length}`,
             };
           },
         })),
@@ -643,3 +645,5 @@ export async function executeOperationsPhase(params: {
 
   return all;
 }
+
+
diff --git a/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts b/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts
index 619710e6..3a3e568a 100644
--- a/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts
+++ b/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts
@@ -8,10 +8,27 @@ import { executeOperationsPhase } from "./execute-operations-phase";
 
 import type { InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
 import type { RunState } from "../contracts";
-import type { OperationInProfile, OperationOutput } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationInProfile,
+} from "@shared/types/operation-profiles";
 
 type TemplateOp = Extract<OperationInProfile, { kind: "template" }>;
 
+function toArtifact(params: {
+  opId: string;
+  title: string;
+  output: LegacyOperationOutput;
+}) {
+  return normalizeOperationArtifactConfig({
+    opId: params.opId,
+    kind: "template",
+    title: params.title,
+    rawParams: { output: params.output },
+  });
+}
+
 function makeTemplateContext(): InstructionRenderContext {
   return {
     char: {},
@@ -54,7 +71,7 @@ function makeRunState(): RunState {
   };
 }
 
-function artifactOutput(tag: string): OperationOutput {
+function artifactOutput(tag: string): LegacyOperationOutput {
   return {
     type: "artifacts",
     writeArtifact: {
@@ -70,7 +87,7 @@ function makeTemplateOp(params: {
   opId: string;
   order: number;
   template: string;
-  output: OperationOutput;
+  output: LegacyOperationOutput;
   hooks: Array<"before_main_llm" | "after_main_llm">;
   dependsOn?: string[];
   required?: boolean;
@@ -88,13 +105,17 @@ function makeTemplateOp(params: {
       dependsOn: params.dependsOn,
       params: {
         template: params.template,
-        output: params.output,
+        artifact: toArtifact({
+          opId: params.opId,
+          title: params.opId,
+          output: params.output,
+        }),
       },
     },
   };
 }
 
-function toExecuteArtifacts(runState: RunState): Record<string, { value: string; history: string[] }> {
+function toExecuteArtifacts(runState: RunState): Record<string, { value: unknown; history: unknown[] }> {
   const merged = { ...runState.persistedArtifactsSnapshot, ...runState.runArtifacts };
   return Object.fromEntries(
     Object.entries(merged).map(([tag, value]) => [
@@ -173,6 +194,11 @@ describe("operations flow integration (execute + commit)", () => {
       sessionKey: null,
       runState,
       runArtifactStore,
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
     });
 
     expect(beforeCommit.requiredError).toBe(false);
@@ -229,6 +255,11 @@ describe("operations flow integration (execute + commit)", () => {
       sessionKey: null,
       runState,
       runArtifactStore,
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
     });
 
     expect(afterCommit.requiredError).toBe(false);
@@ -283,12 +314,17 @@ describe("operations flow integration (execute + commit)", () => {
       sessionKey: null,
       runState,
       runArtifactStore,
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
       onCommitEvent: events.onCommitEvent,
     });
 
     expect(afterCommit.requiredError).toBe(true);
     expect(afterCommit.report.status).toBe("error");
-    expect(afterCommit.report.effects[0]).toMatchObject({
+    expect(afterCommit.report.effects.find((effect) => effect.effectType === "prompt.system_update")).toMatchObject({
       opId: "after-invalid-required",
       effectType: "prompt.system_update",
       status: "error",
diff --git a/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts b/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
index 23aa5781..fb3afea0 100644
--- a/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
+++ b/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
@@ -6,6 +6,7 @@ import type {
   OperationSkipDetails,
   RunDebugStateSnapshotStage,
   RunEvent,
+  RunPersistenceTarget,
   RunState,
   UserTurnTarget,
 } from "../contracts";
@@ -25,7 +26,7 @@ type ExecuteOperationHookPhaseParams = {
   activationSkippedByOpId: ReadonlyMap<string, NonNullable<OperationSkipDetails["activation"]>>;
   executionMode: "concurrent" | "sequential";
   baseMessages: PromptDraftMessage[];
-  baseArtifacts: Record<string, { value: string; history: string[] }>;
+  baseArtifacts: Record<string, { value: unknown; history: unknown[] }>;
   assistantText: string;
   templateContext: {
     char: unknown;
@@ -44,6 +45,7 @@ type ExecuteOperationHookPhaseParams = {
   branchId: string;
   profile: OperationProfile | null;
   sessionKey: string | null;
+  persistenceTarget: RunPersistenceTarget;
   userTurnTarget?: UserTurnTarget;
   debugEnabled: boolean;
   emit: EmitRunEvent;
@@ -100,6 +102,7 @@ export async function* runOperationHookPhase(
       sessionKey: params.sessionKey,
       runState: params.runState,
       runArtifactStore: params.runArtifactStore,
+      persistenceTarget: params.persistenceTarget,
       userTurnTarget: params.userTurnTarget,
       onUserTurnCanonicalized: (data) => {
         params.emit("turn.user.canonicalized", data);
diff --git a/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts b/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts
index ff943b56..00731d2a 100644
--- a/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts
+++ b/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts
@@ -20,7 +20,7 @@ export function cloneLlmMessages(messages: GenerateMessage[]): GenerateMessage[]
 export function mergeArtifacts(
   persisted: RunState["persistedArtifactsSnapshot"],
   runOnly: RunState["runArtifacts"]
-): Record<string, { value: string; history: string[] }> {
+): Record<string, { value: unknown; history: unknown[] }> {
   return Object.fromEntries(
     Object.entries({ ...persisted, ...runOnly }).map(([tag, value]) => [
       tag,
@@ -36,18 +36,20 @@ export function mergeArtifactsForDebug(
   const merged: Record<string, ArtifactValue> = {};
   for (const [tag, value] of Object.entries(persisted)) {
     merged[tag] = {
-      usage: value.usage,
+      format: value.format,
       semantics: value.semantics,
       persistence: value.persistence,
+      writeMode: value.writeMode,
       value: value.value,
       history: [...value.history],
     };
   }
   for (const [tag, value] of Object.entries(runOnly)) {
     merged[tag] = {
-      usage: value.usage,
+      format: value.format,
       semantics: value.semantics,
       persistence: value.persistence,
+      writeMode: value.writeMode,
       value: value.value,
       history: [...value.history],
     };
diff --git a/server/src/services/chat-generation-v3/run-chat-generation-v3.ts b/server/src/services/chat-generation-v3/run-chat-generation-v3.ts
index 8ef409b6..66a46fb7 100644
--- a/server/src/services/chat-generation-v3/run-chat-generation-v3.ts
+++ b/server/src/services/chat-generation-v3/run-chat-generation-v3.ts
@@ -277,6 +277,7 @@ export async function* runChatGenerationV3(
       branchId: context.branchId,
       profile: resolved.profile,
       sessionKey: context.sessionKey,
+      persistenceTarget: request.persistenceTarget,
       userTurnTarget: request.userTurnTarget,
       debugEnabled,
       emit,
@@ -416,6 +417,7 @@ export async function* runChatGenerationV3(
           branchId: context.branchId,
           profile: resolved.profile,
           sessionKey: context.sessionKey,
+          persistenceTarget: request.persistenceTarget,
           userTurnTarget: request.userTurnTarget,
           debugEnabled,
           emit,
diff --git a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
index 1b66b78a..d76fe11b 100644
--- a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
+++ b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
@@ -19,7 +19,20 @@ import {
 } from "./operation-runtime-state";
 
 import type { Entry, Part, Variant } from "@shared/types/chat-entry-parts";
-import type { OperationInProfile } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationInProfile,
+} from "@shared/types/operation-profiles";
+
+function toTemplateArtifact(opId: string, output: LegacyOperationOutput) {
+  return normalizeOperationArtifactConfig({
+    opId,
+    kind: "template",
+    title: opId,
+    rawParams: { output },
+  });
+}
 
 function makeEntry(params: {
   entryId: string;
@@ -86,7 +99,7 @@ describe("operation runtime state bootstrap", () => {
           order: 1,
           params: {
             template: "x",
-            output: {
+            artifact: toTemplateArtifact("op-generate", {
               type: "artifacts",
               writeArtifact: {
                 tag: "state",
@@ -94,7 +107,7 @@ describe("operation runtime state bootstrap", () => {
                 usage: "internal",
                 semantics: "intermediate",
               },
-            },
+            }),
           },
         },
       },
@@ -111,7 +124,7 @@ describe("operation runtime state bootstrap", () => {
           order: 2,
           params: {
             template: "x",
-            output: {
+            artifact: toTemplateArtifact("op-regenerate-only", {
               type: "artifacts",
               writeArtifact: {
                 tag: "state2",
@@ -119,7 +132,7 @@ describe("operation runtime state bootstrap", () => {
                 usage: "internal",
                 semantics: "intermediate",
               },
-            },
+            }),
           },
         },
       },
@@ -162,7 +175,7 @@ describe("operation runtime state bootstrap", () => {
           order: 1,
           params: {
             template: "x",
-            output: {
+            artifact: toTemplateArtifact("op-turns", {
               type: "artifacts",
               writeArtifact: {
                 tag: "state",
@@ -170,7 +183,7 @@ describe("operation runtime state bootstrap", () => {
                 usage: "internal",
                 semantics: "intermediate",
               },
-            },
+            }),
           },
         },
       },
diff --git a/server/src/services/operations/operation-block-validator.test.ts b/server/src/services/operations/operation-block-validator.test.ts
index add2bd01..48c18471 100644
--- a/server/src/services/operations/operation-block-validator.test.ts
+++ b/server/src/services/operations/operation-block-validator.test.ts
@@ -37,6 +37,8 @@ describe("operation block validator", () => {
       ],
     });
     expect(out.operations).toHaveLength(1);
+    expect(out.operations[0]?.config.params.artifact.artifactId).toBe("world_state");
+    expect(out.operations[0]?.config.params.artifact.tag).toBe("world_state");
   });
 
   test("rejects dependency to unknown opId", () => {
@@ -116,4 +118,126 @@ describe("operation block validator", () => {
       expect(issues.some((issue) => issue.message === "activation must include at least one interval")).toBe(true);
     }
   });
+
+  test("fills missing tag for artifact configs loaded from older saved blocks", () => {
+    const out = validateOperationBlockUpsertInput({
+      name: "block",
+      enabled: true,
+      operations: [
+        {
+          opId: "9ff77029-5037-4d21-8ace-c9836f58a14b",
+          name: "saved-op",
+          kind: "template",
+          config: {
+            enabled: true,
+            required: false,
+            hooks: ["before_main_llm"],
+            order: 10,
+            params: {
+              template: "Hello",
+              artifact: {
+                artifactId: "artifact:9ff77029-5037-4d21-8ace-c9836f58a14b",
+                title: "Saved artifact",
+                format: "markdown",
+                persistence: "run_only",
+                writeMode: "replace",
+                history: {
+                  enabled: true,
+                  maxItems: 20,
+                },
+                exposures: [],
+              },
+            },
+          },
+        },
+      ],
+    });
+
+    expect(out.operations[0]?.config.params.artifact.tag).toBe("saved_op");
+  });
+
+  test("migrates legacy prompt_time output into artifact exposures", () => {
+    const out = validateOperationBlockUpsertInput({
+      name: "block",
+      enabled: true,
+      operations: [
+        {
+          opId: "7ff77029-5037-4d21-8ace-c9836f58a14b",
+          name: "prompt-op",
+          kind: "template",
+          config: {
+            enabled: true,
+            required: false,
+            hooks: ["before_main_llm"],
+            order: 10,
+            params: {
+              template: "Hello",
+              output: {
+                type: "prompt_time",
+                promptTime: {
+                  kind: "append_after_last_user",
+                  role: "system",
+                  source: "legacy",
+                },
+              },
+            },
+          },
+        },
+      ],
+    });
+
+    expect(out.operations[0]?.config.params.artifact.exposures).toEqual([
+      {
+        type: "prompt_message",
+        role: "system",
+        anchor: "after_last_user",
+        source: "legacy",
+      },
+    ]);
+  });
+
+  test("rejects prompt_message exposure in after_main_llm hook", () => {
+    expect(() =>
+      validateOperationBlockUpsertInput({
+        name: "block",
+        enabled: true,
+        operations: [
+          {
+            opId: "8ff77029-5037-4d21-8ace-c9836f58a14b",
+            name: "bad-op",
+            kind: "template",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["after_main_llm"],
+              order: 10,
+              params: {
+                template: "Hello",
+                artifact: {
+                  artifactId: "artifact:bad-op",
+                  tag: "bad_artifact",
+                  title: "Bad artifact",
+                  format: "markdown",
+                  persistence: "run_only",
+                  writeMode: "replace",
+                  history: {
+                    enabled: true,
+                    maxItems: 20,
+                  },
+                  exposures: [
+                    {
+                      type: "prompt_message",
+                      role: "system",
+                      anchor: "after_last_user",
+                    },
+                  ],
+                },
+              },
+            },
+          },
+        ],
+      })
+    ).toThrow(/before_main_llm/i);
+  });
 });
+
diff --git a/server/src/services/operations/operation-block-validator.ts b/server/src/services/operations/operation-block-validator.ts
index dcf93dd5..42346c63 100644
--- a/server/src/services/operations/operation-block-validator.ts
+++ b/server/src/services/operations/operation-block-validator.ts
@@ -7,17 +7,24 @@ import { validateLiquidTemplate } from "../chat-core/prompt-template-renderer";
 import { compileLlmJsonSchemaSpec } from "./llm-json-schema-spec";
 import { llmOperationParamsSchema } from "./llm-operation-params";
 
-import type {
-  OperationActivationConfig,
-  ArtifactPersistence,
-  ArtifactUsage,
-  OperationBlockExport,
-  OperationBlockUpsertInput,
-  OperationHook,
-  OperationInProfile,
-  OperationKind,
-  OperationTrigger,
-  PromptTimeMessageRole,
+import {
+  normalizeOperationArtifactConfig,
+  type ArtifactExposure,
+  type ArtifactFormat,
+  type ArtifactPersistence,
+  type ArtifactSemantics,
+  type ArtifactUsage,
+  type ArtifactWriteMode,
+  type OperationActivationConfig,
+  type OperationBlockExport,
+  type OperationBlockUpsertInput,
+  type OperationHook,
+  type OperationInProfile,
+  type OperationKind,
+  type OperationProfile,
+  type OperationTemplateParams,
+  type OperationTrigger,
+  type PromptTimeMessageRole,
 } from "@shared/types/operation-profiles";
 
 const uuidSchema = z.string().uuid();
@@ -40,6 +47,63 @@ const operationActivationSchema = z
 
 const artifactPersistenceSchema = z.enum(["persisted", "run_only"] satisfies ArtifactPersistence[]);
 const artifactUsageSchema = z.enum(["prompt_only", "ui_only", "prompt+ui", "internal"] satisfies ArtifactUsage[]);
+const artifactWriteModeSchema = z.enum(["replace", "append"] satisfies ArtifactWriteMode[]);
+const artifactFormatSchema = z.enum(["text", "markdown", "json"] satisfies ArtifactFormat[]);
+const promptTimeRoleSchema = z
+  .enum(["system", "developer", "user", "assistant"])
+  .transform((value): PromptTimeMessageRole => (value === "developer" ? "system" : value));
+
+const promptPartExposureSchema = z.object({
+  type: z.literal("prompt_part"),
+  target: z.literal("system"),
+  mode: z.enum(["prepend", "append", "replace"]),
+  source: z.string().trim().min(1).optional(),
+});
+
+const promptMessageExposureSchema = z.union([
+  z.object({
+    type: z.literal("prompt_message"),
+    role: promptTimeRoleSchema,
+    anchor: z.literal("after_last_user"),
+    source: z.string().trim().min(1).optional(),
+  }),
+  z.object({
+    type: z.literal("prompt_message"),
+    role: promptTimeRoleSchema,
+    anchor: z.literal("depth_from_end"),
+    depthFromEnd: z.number().finite().transform((value) => Math.max(0, Math.floor(Math.abs(value)))),
+    source: z.string().trim().min(1).optional(),
+  }),
+]);
+
+const turnRewriteExposureSchema = z.object({
+  type: z.literal("turn_rewrite"),
+  target: z.enum(["current_user_main", "assistant_output_main"]),
+  mode: z.literal("replace"),
+});
+
+const uiInlineExposureSchema = z.union([
+  z.object({
+    type: z.literal("ui_inline"),
+    role: promptTimeRoleSchema,
+    anchor: z.literal("after_last_user"),
+    source: z.string().trim().min(1).optional(),
+  }),
+  z.object({
+    type: z.literal("ui_inline"),
+    role: promptTimeRoleSchema,
+    anchor: z.literal("depth_from_end"),
+    depthFromEnd: z.number().finite().transform((value) => Math.max(0, Math.floor(Math.abs(value)))),
+    source: z.string().trim().min(1).optional(),
+  }),
+]);
+
+const artifactExposureSchema: z.ZodType<ArtifactExposure> = z.union([
+  promptPartExposureSchema,
+  promptMessageExposureSchema,
+  turnRewriteExposureSchema,
+  uiInlineExposureSchema,
+]);
 
 const artifactTagSchema = z
   .string()
@@ -47,27 +111,30 @@ const artifactTagSchema = z
   .min(1)
   .regex(/^[a-z][a-z0-9_]*$/, "tag must match ^[a-z][a-z0-9_]*$");
 
-function normalizePromptTimeRole(value: "system" | "developer" | "user" | "assistant"): PromptTimeMessageRole {
-  return value === "developer" ? "system" : value;
-}
-
-function normalizeDepthFromEnd(value: number): number {
-  if (!Number.isFinite(value)) return 0;
-  return Math.abs(Math.floor(value));
-}
-
-const promptTimeRoleSchema = z
-  .enum(["system", "developer", "user", "assistant"])
-  .transform((value): PromptTimeMessageRole => normalizePromptTimeRole(value));
+const artifactConfigSchema = z.object({
+  artifactId: z.string().trim().min(1),
+  tag: artifactTagSchema.optional(),
+  title: z.string().trim().min(1),
+  description: z.string().trim().min(1).optional(),
+  format: artifactFormatSchema,
+  persistence: artifactPersistenceSchema,
+  writeMode: artifactWriteModeSchema,
+  history: z.object({
+    enabled: z.boolean(),
+    maxItems: z.number().int().min(1),
+  }),
+  semantics: z.string().trim().min(1).optional(),
+  exposures: z.array(artifactExposureSchema),
+});
 
-const artifactWriteTargetSchema = z.object({
+const legacyArtifactWriteTargetSchema = z.object({
   tag: artifactTagSchema,
   persistence: artifactPersistenceSchema,
   usage: artifactUsageSchema,
   semantics: z.string().min(1),
 });
 
-const promptTimeEffectSchema = z.discriminatedUnion("kind", [
+const legacyPromptTimeEffectSchema = z.discriminatedUnion("kind", [
   z.object({
     kind: z.literal("append_after_last_user"),
     role: promptTimeRoleSchema,
@@ -80,62 +147,45 @@ const promptTimeEffectSchema = z.discriminatedUnion("kind", [
   }),
   z.object({
     kind: z.literal("insert_at_depth"),
-    depthFromEnd: z.number().finite().transform((value) => normalizeDepthFromEnd(value)),
+    depthFromEnd: z.number().finite().transform((value) => Math.max(0, Math.floor(Math.abs(value)))),
     role: promptTimeRoleSchema,
     source: z.string().trim().min(1).optional(),
   }),
 ]);
 
-const turnCanonicalizationEffectSchema = z.object({
-  kind: z.literal("replace_text"),
-  target: z.enum(["user", "assistant"]),
-});
-
-const operationOutputSchema = z.discriminatedUnion("type", [
+const legacyOperationOutputSchema = z.discriminatedUnion("type", [
   z.object({
     type: z.literal("artifacts"),
-    writeArtifact: artifactWriteTargetSchema,
+    writeArtifact: legacyArtifactWriteTargetSchema,
   }),
   z.object({
     type: z.literal("prompt_time"),
-    promptTime: promptTimeEffectSchema,
+    promptTime: legacyPromptTimeEffectSchema,
   }),
   z.object({
     type: z.literal("turn_canonicalization"),
-    canonicalization: turnCanonicalizationEffectSchema,
+    canonicalization: z.object({
+      kind: z.literal("replace_text"),
+      target: z.enum(["user", "assistant"]),
+    }),
   }),
 ]);
 
-const templateParamsNewSchema = z.object({
-  template: z.string(),
-  strictVariables: z.boolean().optional(),
-  output: operationOutputSchema,
-});
-
-const templateParamsLegacySchema = z.object({
+const templateParamsSchema = z.object({
   template: z.string(),
   strictVariables: z.boolean().optional(),
-  writeArtifact: artifactWriteTargetSchema,
-});
-
-const templateParamsSchema = z.union([templateParamsNewSchema, templateParamsLegacySchema]).transform((v) => {
-  if ("output" in v) return v;
-  return {
-    template: v.template,
-    strictVariables: v.strictVariables,
-    output: {
-      type: "artifacts" as const,
-      writeArtifact: v.writeArtifact,
-    },
-  };
+  artifact: artifactConfigSchema.optional(),
+  output: legacyOperationOutputSchema.optional(),
+  writeArtifact: legacyArtifactWriteTargetSchema.optional(),
 });
 
 const otherKindParamsSchema = z.object({
   params: z.record(z.string(), z.unknown()),
-  output: operationOutputSchema,
+  artifact: artifactConfigSchema.optional(),
+  output: legacyOperationOutputSchema.optional(),
 });
 
-const operationConfigTemplateSchema = z.object({
+const operationConfigBaseSchema = z.object({
   enabled: z.boolean(),
   required: z.boolean(),
   hooks: z.array(operationHookSchema).min(1),
@@ -143,63 +193,82 @@ const operationConfigTemplateSchema = z.object({
   activation: operationActivationSchema.optional(),
   order: z.number().finite(),
   dependsOn: z.array(uuidSchema).optional(),
+});
+
+const operationConfigTemplateSchema = operationConfigBaseSchema.extend({
   params: templateParamsSchema,
 });
 
-const operationConfigOtherSchema = z.object({
-  enabled: z.boolean(),
-  required: z.boolean(),
-  hooks: z.array(operationHookSchema).min(1),
-  triggers: z.array(operationTriggerSchema).min(1).optional(),
-  activation: operationActivationSchema.optional(),
-  order: z.number().finite(),
-  dependsOn: z.array(uuidSchema).optional(),
+const operationConfigOtherSchema = operationConfigBaseSchema.extend({
   params: otherKindParamsSchema,
 });
 
-const operationConfigLlmSchema = z.object({
-  enabled: z.boolean(),
-  required: z.boolean(),
-  hooks: z.array(operationHookSchema).min(1),
-  triggers: z.array(operationTriggerSchema).min(1).optional(),
-  activation: operationActivationSchema.optional(),
-  order: z.number().finite(),
-  dependsOn: z.array(uuidSchema).optional(),
+const operationConfigLlmSchema = operationConfigBaseSchema.extend({
   params: z.object({
     params: llmOperationParamsSchema,
-    output: operationOutputSchema,
+    artifact: artifactConfigSchema.optional(),
+    output: legacyOperationOutputSchema.optional(),
   }),
 });
 
-export const operationInProfileSchema: z.ZodType<OperationInProfile> = z.discriminatedUnion("kind", [
-  z.object({
-    opId: uuidSchema,
-    name: z.string().trim().min(1),
-    description: z.string().trim().min(1).optional(),
-    kind: z.literal("template"),
-    config: operationConfigTemplateSchema,
-  }),
-  z.object({
-    opId: uuidSchema,
-    name: z.string().trim().min(1),
-    description: z.string().trim().min(1).optional(),
-    kind: z.literal("llm"),
-    config: operationConfigLlmSchema,
-  }),
-  z.object({
-    opId: uuidSchema,
-    name: z.string().trim().min(1),
-    description: z.string().trim().min(1).optional(),
-    kind: z.enum([
-      "rag",
-      "tool",
-      "compute",
-      "transform",
-      "legacy",
-    ] satisfies Exclude<OperationKind, "template" | "llm">[]),
-    config: operationConfigOtherSchema,
-  }),
-]);
+export const operationInProfileSchema: z.ZodType<OperationInProfile> = z
+  .discriminatedUnion("kind", [
+    z.object({
+      opId: uuidSchema,
+      name: z.string().trim().min(1),
+      description: z.string().trim().min(1).optional(),
+      kind: z.literal("template"),
+      config: operationConfigTemplateSchema,
+    }),
+    z.object({
+      opId: uuidSchema,
+      name: z.string().trim().min(1),
+      description: z.string().trim().min(1).optional(),
+      kind: z.literal("llm"),
+      config: operationConfigLlmSchema,
+    }),
+    z.object({
+      opId: uuidSchema,
+      name: z.string().trim().min(1),
+      description: z.string().trim().min(1).optional(),
+      kind: z.enum([
+        "rag",
+        "tool",
+        "compute",
+        "transform",
+        "legacy",
+      ] satisfies Exclude<OperationKind, "template" | "llm">[]),
+      config: operationConfigOtherSchema,
+    }),
+  ])
+  .transform((op): OperationInProfile => {
+    const artifact = normalizeOperationArtifactConfig({
+      opId: op.opId,
+      kind: op.kind,
+      title: op.name,
+      rawParams: op.config.params,
+    });
+
+    const normalizedConfig = {
+      ...op.config,
+      params:
+        op.kind === "template"
+          ? {
+              template: op.config.params.template,
+              strictVariables: op.config.params.strictVariables,
+              artifact,
+            }
+          : {
+              params: op.config.params.params,
+              artifact,
+            },
+    };
+
+    return {
+      ...op,
+      config: normalizedConfig,
+    } as OperationInProfile;
+  });
 
 const upsertInputSchema: z.ZodType<OperationBlockUpsertInput> = z.object({
   name: z.string().trim().min(1),
@@ -280,6 +349,36 @@ function detectDependencyCycle(ops: OperationInProfile[]): boolean {
   return false;
 }
 
+function validateExposurePolicy(op: OperationInProfile, exposure: ArtifactExposure): void {
+  if (exposure.type === "prompt_part" || exposure.type === "prompt_message") {
+    if (!op.config.hooks.includes("before_main_llm")) {
+      throw new HttpError(
+        400,
+        `${exposure.type} requires before_main_llm hook`,
+        "VALIDATION_ERROR",
+        { opId: op.opId }
+      );
+    }
+    return;
+  }
+
+  if (exposure.type === "turn_rewrite" && exposure.target === "assistant_output_main") {
+    if (!op.config.hooks.includes("after_main_llm")) {
+      throw new HttpError(
+        400,
+        "turn_rewrite target=assistant_output_main requires after_main_llm hook",
+        "VALIDATION_ERROR",
+        { opId: op.opId }
+      );
+    }
+    return;
+  }
+
+  if (exposure.type === "ui_inline") {
+    return;
+  }
+}
+
 function validateCrossRules(input: ValidatedOperationBlockInput): void {
   const opsById = new Map<string, OperationInProfile>();
   const opIds = new Set<string>();
@@ -293,7 +392,13 @@ function validateCrossRules(input: ValidatedOperationBlockInput): void {
     opsById.set(op.opId, op);
   }
 
+  const artifactIds = new Map<string, string>();
+  const artifactTags = new Map<string, string>();
   for (const op of input.operations) {
+    for (const exposure of op.config.params.artifact.exposures) {
+      validateExposurePolicy(op, exposure);
+    }
+
     const deps = op.config.dependsOn ?? [];
     for (const dep of deps) {
       if (dep === op.opId) {
@@ -326,36 +431,9 @@ function validateCrossRules(input: ValidatedOperationBlockInput): void {
       }
     }
 
-    const params: Record<string, unknown> = op.config.params as unknown as Record<string, unknown>;
-    const output = params.output as
-      | { type: "prompt_time"; promptTime?: { target?: unknown } }
-      | { type: "turn_canonicalization"; canonicalization?: { target?: unknown } }
-      | undefined;
-    if (output?.type === "prompt_time" && !op.config.hooks.includes("before_main_llm")) {
-      throw new HttpError(
-        400,
-        "prompt_time output requires before_main_llm hook",
-        "VALIDATION_ERROR",
-        { opId: op.opId }
-      );
-    }
-
-    if (
-      output?.type === "turn_canonicalization" &&
-      output?.canonicalization?.target === "assistant" &&
-      !op.config.hooks.includes("after_main_llm")
-    ) {
-      throw new HttpError(
-        400,
-        "turn_canonicalization target=assistant requires after_main_llm hook",
-        "VALIDATION_ERROR",
-        { opId: op.opId }
-      );
-    }
-
     if (op.kind === "template") {
       try {
-        validateLiquidTemplate(op.config.params.template);
+        validateLiquidTemplate((op.config.params as OperationTemplateParams).template);
       } catch (error) {
         throw new HttpError(
           400,
@@ -422,27 +500,30 @@ function validateCrossRules(input: ValidatedOperationBlockInput): void {
         }
       }
     }
-  }
 
-  if (detectDependencyCycle(input.operations)) {
-    throw new HttpError(400, "Dependency cycle detected", "VALIDATION_ERROR");
-  }
+    const existingArtifactId = artifactIds.get(op.config.params.artifact.artifactId);
+    if (existingArtifactId) {
+      throw new HttpError(400, "Duplicate artifactId in block", "VALIDATION_ERROR", {
+        artifactId: op.config.params.artifact.artifactId,
+        opId: op.opId,
+        conflictsWithOpId: existingArtifactId,
+      });
+    }
+    artifactIds.set(op.config.params.artifact.artifactId, op.opId);
 
-  const tags = new Map<string, string>(); // tag -> opId
-  for (const op of input.operations) {
-    const params = op.config.params as unknown as { output?: { type?: string; writeArtifact?: { tag?: string } } };
-    if (!params?.output || params.output.type !== "artifacts") continue;
-    const tag = params.output.writeArtifact?.tag;
-    if (!tag) continue;
-    const existing = tags.get(tag);
-    if (existing) {
+    const existingTag = artifactTags.get(op.config.params.artifact.tag);
+    if (existingTag) {
       throw new HttpError(400, "Duplicate artifact tag in block", "VALIDATION_ERROR", {
-        tag,
+        tag: op.config.params.artifact.tag,
         opId: op.opId,
-        conflictsWithOpId: existing,
+        conflictsWithOpId: existingTag,
       });
     }
-    tags.set(tag, op.opId);
+    artifactTags.set(op.config.params.artifact.tag, op.opId);
+  }
+
+  if (detectDependencyCycle(input.operations)) {
+    throw new HttpError(400, "Dependency cycle detected", "VALIDATION_ERROR");
   }
 }
 
@@ -498,3 +579,32 @@ export function validateOperationBlockImport(raw: unknown): ValidatedOperationBl
     meta: parsed.data.meta,
   });
 }
+
+export function validateCompiledProfileArtifactWriters(profile: OperationProfile): void {
+  const artifactIds = new Map<string, string>();
+  const artifactTags = new Map<string, string>();
+
+  for (const op of profile.operations ?? []) {
+    const artifactId = op.config.params.artifact.artifactId;
+    const existingArtifactId = artifactIds.get(artifactId);
+    if (existingArtifactId) {
+      throw new HttpError(400, "Duplicate artifactId in compiled profile", "VALIDATION_ERROR", {
+        artifactId,
+        opId: op.opId,
+        conflictsWithOpId: existingArtifactId,
+      });
+    }
+    artifactIds.set(artifactId, op.opId);
+
+    const tag = op.config.params.artifact.tag;
+    const existingTag = artifactTags.get(tag);
+    if (existingTag) {
+      throw new HttpError(400, "Duplicate artifact tag in compiled profile", "VALIDATION_ERROR", {
+        tag,
+        opId: op.opId,
+        conflictsWithOpId: existingTag,
+      });
+    }
+    artifactTags.set(tag, op.opId);
+  }
+}
diff --git a/server/src/services/operations/operation-blocks-repository.ts b/server/src/services/operations/operation-blocks-repository.ts
index 7b2deb0e..4e12ede2 100644
--- a/server/src/services/operations/operation-blocks-repository.ts
+++ b/server/src/services/operations/operation-blocks-repository.ts
@@ -25,6 +25,13 @@ function parseSpecJson(value: string): OperationBlockSpecRow {
 
 function rowToDto(row: typeof operationBlocks.$inferSelect): OperationBlock {
   const spec = parseSpecJson(row.specJson);
+  const normalized = validateOperationBlockUpsertInput({
+    name: row.name,
+    description: row.description ?? undefined,
+    enabled: row.enabled,
+    operations: spec.operations,
+    meta: safeJsonParse(row.metaJson, null),
+  });
   return {
     blockId: row.id,
     ownerId: row.ownerId,
@@ -32,8 +39,8 @@ function rowToDto(row: typeof operationBlocks.$inferSelect): OperationBlock {
     description: row.description ?? undefined,
     enabled: row.enabled,
     version: row.version,
-    operations: spec.operations,
-    meta: safeJsonParse(row.metaJson, null),
+    operations: normalized.operations,
+    meta: normalized.meta,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt,
   };
diff --git a/server/src/services/operations/operation-profile-resolver.test.ts b/server/src/services/operations/operation-profile-resolver.test.ts
index b6a4e4e2..c494a830 100644
--- a/server/src/services/operations/operation-profile-resolver.test.ts
+++ b/server/src/services/operations/operation-profile-resolver.test.ts
@@ -2,7 +2,12 @@ import { describe, expect, test, vi } from "vitest";
 
 import { resolveCompiledOperationProfile } from "./operation-profile-resolver";
 
-import type { OperationBlock, OperationProfile } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationBlock,
+  type OperationProfile,
+} from "@shared/types/operation-profiles";
 
 const blockById = new Map<string, OperationBlock>();
 
@@ -14,6 +19,7 @@ function makeBlock(params: {
   blockId: string;
   version: number;
   order: number;
+  artifactTag?: string;
 }): OperationBlock {
   const now = new Date();
   return {
@@ -35,15 +41,22 @@ function makeBlock(params: {
           dependsOn: [],
           params: {
             template: "hello",
-            output: {
-              type: "artifacts",
-              writeArtifact: {
-                tag: `${params.blockId.replace(/-/g, "_")}_state`,
-                persistence: "run_only",
-                usage: "internal",
-                semantics: "intermediate",
+            artifact: normalizeOperationArtifactConfig({
+              opId: "op-1e6df0d9-2d3a-420f-83f0-a4e90ca1b056",
+              kind: "template",
+              title: "op",
+              rawParams: {
+                output: {
+                  type: "artifacts",
+                  writeArtifact: {
+                    tag: params.artifactTag ?? `${params.blockId.replace(/-/g, "_")}_state`,
+                    persistence: "run_only",
+                    usage: "internal",
+                    semantics: "intermediate",
+                  },
+                } satisfies LegacyOperationOutput,
               },
-            },
+            }),
           },
         },
       },
@@ -123,4 +136,40 @@ describe("operation profile resolver", () => {
     expect(out.blockVersionFingerprint).toBe("");
     expect(out.operations).toEqual([]);
   });
+
+  test("rejects duplicate artifact writers after block flattening", async () => {
+    blockById.clear();
+    blockById.set("11111111-1111-4111-8111-111111111111", makeBlock({
+      blockId: "11111111-1111-4111-8111-111111111111",
+      version: 1,
+      order: 10,
+      artifactTag: "shared_state",
+    }));
+    blockById.set("22222222-2222-4222-8222-222222222222", makeBlock({
+      blockId: "22222222-2222-4222-8222-222222222222",
+      version: 1,
+      order: 20,
+      artifactTag: "shared_state",
+    }));
+
+    const now = new Date();
+    const profile: OperationProfile = {
+      profileId: "profile-dup",
+      ownerId: "global",
+      name: "dup",
+      enabled: true,
+      executionMode: "sequential",
+      operationProfileSessionId: "sess-dup",
+      version: 1,
+      blockRefs: [
+        { blockId: "11111111-1111-4111-8111-111111111111", enabled: true, order: 10 },
+        { blockId: "22222222-2222-4222-8222-222222222222", enabled: true, order: 20 },
+      ],
+      meta: null,
+      createdAt: now,
+      updatedAt: now,
+    };
+
+    await expect(resolveCompiledOperationProfile(profile)).rejects.toThrow(/duplicate artifactId in compiled profile/i);
+  });
 });
diff --git a/server/src/services/operations/operation-profile-resolver.ts b/server/src/services/operations/operation-profile-resolver.ts
index 461f331e..6924576c 100644
--- a/server/src/services/operations/operation-profile-resolver.ts
+++ b/server/src/services/operations/operation-profile-resolver.ts
@@ -1,6 +1,7 @@
 import { HttpError } from "@core/middleware/error-handler";
 
 import { getOperationBlockById } from "./operation-blocks-repository";
+import { validateCompiledProfileArtifactWriters } from "./operation-block-validator";
 
 import type {
   OperationBlock,
@@ -72,6 +73,7 @@ export async function resolveCompiledOperationProfile(
 ): Promise<CompiledOperationProfile> {
   if (!Array.isArray(profile.blockRefs) || profile.blockRefs.length === 0) {
     const operations = profile.operations ?? [];
+    validateCompiledProfileArtifactWriters({ ...profile, operations });
     return {
       profile,
       operations,
@@ -101,6 +103,8 @@ export async function resolveCompiledOperationProfile(
     .map((item) => `${item.blockId}:${item.version}`)
     .join("|");
 
+  validateCompiledProfileArtifactWriters({ ...profile, operations });
+
   return {
     profile,
     operations,
diff --git a/server/src/services/operations/template-operations-runtime.test.ts b/server/src/services/operations/template-operations-runtime.test.ts
index bca3ab4a..db82650b 100644
--- a/server/src/services/operations/template-operations-runtime.test.ts
+++ b/server/src/services/operations/template-operations-runtime.test.ts
@@ -5,7 +5,20 @@ import {
   applyTemplateOperationsToPromptDraft,
 } from "./template-operations-runtime";
 
-import type { OperationProfile } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationProfile,
+} from "@shared/types/operation-profiles";
+
+function toArtifact(opId: string, title: string, output: LegacyOperationOutput) {
+  return normalizeOperationArtifactConfig({
+    opId,
+    kind: "template",
+    title,
+    rawParams: { output },
+  });
+}
 
 
 function makeProfile(operations: OperationProfile["operations"]): OperationProfile {
@@ -41,10 +54,10 @@ describe("template operations runtime", () => {
           order: 10,
           params: {
             template: "[{{user.name}}]",
-            output: {
+            artifact: toArtifact("a7ea76de-6e0a-4f8a-a9fb-6eb9ad33c7df", "sys prepend", {
               type: "prompt_time",
               promptTime: { kind: "system_update", mode: "prepend", source: "t" },
-            },
+            }),
           },
         },
       },
@@ -86,10 +99,10 @@ describe("template operations runtime", () => {
           order: 10,
           params: {
             template: "normalized",
-            output: {
+            artifact: toArtifact("de11b614-a56e-4d95-9ee3-5a4ffb0b2d44", "assistant post", {
               type: "turn_canonicalization",
               canonicalization: { kind: "replace_text", target: "assistant" },
-            },
+            }),
           },
         },
       },
@@ -129,7 +142,7 @@ describe("template operations runtime", () => {
           order: 10,
           params: {
             template: "{{promptSystem}}",
-            output: {
+            artifact: toArtifact("4b7c0a14-5528-4f65-beb0-f8a65ef6a1f2", "copy system", {
               type: "artifacts",
               writeArtifact: {
                 tag: "sys_copy",
@@ -137,7 +150,7 @@ describe("template operations runtime", () => {
                 usage: "internal",
                 semantics: "intermediate",
               },
-            },
+            }),
           },
         },
       },
@@ -165,4 +178,77 @@ describe("template operations runtime", () => {
 
     expect(out.artifacts.sys_copy?.value).toBe("sys one\n\nsys two");
   });
+
+  test("provides artifact tag access for cross-operation artifact references", async () => {
+    const profile = makeProfile([
+      {
+        opId: "producer-op",
+        name: "producer",
+        kind: "template",
+        config: {
+          enabled: true,
+          required: false,
+          hooks: ["before_main_llm"],
+          triggers: ["generate"],
+          order: 10,
+          params: {
+            template: "VALUE_FROM_PRODUCER",
+            artifact: toArtifact("producer-op", "producer", {
+              type: "artifacts",
+              writeArtifact: {
+                tag: "producer_value",
+                persistence: "run_only",
+                usage: "internal",
+                semantics: "intermediate",
+              },
+            }),
+          },
+        },
+      },
+      {
+        opId: "consumer-op",
+        name: "consumer",
+        kind: "template",
+        config: {
+          enabled: true,
+          required: false,
+          hooks: ["before_main_llm"],
+          triggers: ["generate"],
+          order: 20,
+          dependsOn: ["producer-op"],
+          params: {
+            template: "{{artByOpId[\"producer-op\"].value}}",
+            artifact: toArtifact("consumer-op", "consumer", {
+              type: "artifacts",
+              writeArtifact: {
+                tag: "consumer_value",
+                persistence: "run_only",
+                usage: "internal",
+                semantics: "intermediate",
+              },
+            }),
+          },
+        },
+      },
+    ]);
+
+    const out = await applyTemplateOperationsToPromptDraft({
+      runId: "run-4",
+      profile,
+      trigger: "generate",
+      draftMessages: [{ role: "user", content: "hello" }],
+      templateContext: {
+        char: {},
+        user: {},
+        chat: {},
+        messages: [],
+        rag: {},
+        art: {},
+        now: new Date().toISOString(),
+      },
+    });
+
+    expect(out.artifacts.consumer_value?.value).toBe("VALUE_FROM_PRODUCER");
+  });
 });
+
diff --git a/server/src/services/operations/template-operations-runtime.ts b/server/src/services/operations/template-operations-runtime.ts
index 8b160b6f..629b5e34 100644
--- a/server/src/services/operations/template-operations-runtime.ts
+++ b/server/src/services/operations/template-operations-runtime.ts
@@ -1,15 +1,11 @@
 import { runOrchestrator } from "@core/operation-orchestrator";
 
 import { renderLiquidTemplate } from "../chat-core/prompt-template-renderer";
+import { compileArtifactExposureEffect } from "../chat-generation-v3/contracts";
+import { applyPromptEffect } from "../chat-generation-v3/operations/effect-handlers/prompt-effects";
 
 import type { InstructionRenderContext } from "../chat-core/prompt-template-renderer";
-import type {
-  OperationInProfile,
-  OperationOutput,
-  OperationProfile,
-  OperationTrigger,
-} from "@shared/types/operation-profiles";
-
+import type { OperationInProfile, OperationProfile, OperationTrigger } from "@shared/types/operation-profiles";
 
 export type PromptDraftMessage = {
   role: "system" | "user" | "assistant";
@@ -18,7 +14,7 @@ export type PromptDraftMessage = {
 
 type RuntimeState = {
   messages: PromptDraftMessage[];
-  art: Record<string, { value: string; history: string[] }>;
+  art: Record<string, { value: unknown; history: unknown[] }>;
   assistantText: string;
 };
 
@@ -34,108 +30,89 @@ function normalizeText(value: unknown): string {
   return typeof value === "string" ? value : String(value ?? "");
 }
 
-function normalizePromptTimeRole(value: unknown): PromptDraftMessage["role"] {
-  if (value === "assistant" || value === "user" || value === "system") return value;
-  if (value === "developer") return "system";
-  return "system";
-}
-
-function resolveMinInsertIndex(messages: PromptDraftMessage[]): number {
-  const firstSystemIdx = messages.findIndex((message) => message.role === "system");
-  return firstSystemIdx >= 0 ? firstSystemIdx + 1 : 0;
-}
-
-function applyPromptTimeEffect(
-  state: RuntimeState,
-  output: Extract<OperationOutput, { type: "prompt_time" }>,
-  payload: string
-): void {
-  const promptTime = output.promptTime;
-  if (promptTime.kind === "system_update") {
-    const idx = state.messages.findIndex((m) => m.role === "system");
-    const current = idx >= 0 ? state.messages[idx]!.content : "";
-
-    const next =
-      promptTime.mode === "replace"
-        ? payload
-        : promptTime.mode === "prepend"
-          ? `${payload}${current}`
-          : `${current}${payload}`;
-
-    if (idx >= 0) state.messages[idx] = { role: "system", content: next };
-    else state.messages.unshift({ role: "system", content: next });
-    return;
-  }
-
-  if (promptTime.kind === "append_after_last_user") {
-    const lastUserIdx = state.messages.map((m) => m.role).lastIndexOf("user");
-    const insertAt = lastUserIdx >= 0 ? lastUserIdx + 1 : state.messages.length;
-    state.messages.splice(insertAt, 0, { role: normalizePromptTimeRole(promptTime.role), content: payload });
-    return;
+function mapArtifactsByOpId(
+  operations: OperationInProfile[],
+  artifacts: Record<string, { value: unknown; history: unknown[] }>
+): Record<string, { value: unknown; history: unknown[] }> {
+  const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
+  for (const op of operations) {
+    const artifact = artifacts[op.config.params.artifact.artifactId];
+    if (!artifact) continue;
+    mapped[op.opId] = { value: artifact.value, history: [...artifact.history] };
   }
-
-  const raw = state.messages.length - Math.abs(promptTime.depthFromEnd);
-  const minInsertAt = resolveMinInsertIndex(state.messages);
-  const insertAt = Math.min(state.messages.length, Math.max(minInsertAt, raw));
-  state.messages.splice(insertAt, 0, { role: normalizePromptTimeRole(promptTime.role), content: payload });
+  return mapped;
 }
 
-function applyTurnCanonicalizationEffect(
-  state: RuntimeState,
-  output: Extract<OperationOutput, { type: "turn_canonicalization" }>,
-  payload: string,
-  hook: "before_main_llm" | "after_main_llm"
-): void {
-  const canonicalization = output.canonicalization;
-  if (canonicalization.kind !== "replace_text") return;
-
-  if (canonicalization.target === "assistant" && hook === "after_main_llm") {
-    state.assistantText = payload;
-    return;
-  }
-
-  if (canonicalization.target === "user") {
-    const lastUserIdx = state.messages.map((m) => m.role).lastIndexOf("user");
-    if (lastUserIdx >= 0) {
-      state.messages[lastUserIdx] = { role: "user", content: payload };
-    }
+function mapArtifactsForTemplate(
+  operations: OperationInProfile[],
+  artifacts: Record<string, { value: unknown; history: unknown[] }>
+): Record<string, { value: unknown; history: unknown[] }> {
+  const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
+  for (const op of operations) {
+    const artifact = artifacts[op.config.params.artifact.artifactId];
+    if (!artifact) continue;
+    const snapshot = { value: artifact.value, history: [...artifact.history] };
+    mapped[op.config.params.artifact.tag] = snapshot;
+    mapped[op.config.params.artifact.artifactId] = snapshot;
   }
+  return mapped;
 }
 
-function applyOperationOutput(
+function applyArtifactEffects(
   state: RuntimeState,
-  output: OperationOutput,
-  payload: string,
-  hook: "before_main_llm" | "after_main_llm"
+  op: Extract<OperationInProfile, { kind: "template" }>,
+  payload: string
 ): void {
-  if (output.type === "prompt_time") {
-    if (hook === "before_main_llm") applyPromptTimeEffect(state, output, payload);
-    return;
-  }
-
-  if (output.type === "turn_canonicalization") {
-    applyTurnCanonicalizationEffect(state, output, payload, hook);
-    return;
-  }
-
-  const tag = output.writeArtifact.tag;
-  const existing = state.art[tag];
+  const artifact = op.config.params.artifact;
+  const existing = state.art[artifact.artifactId];
   if (existing) {
     existing.value = payload;
     existing.history.push(payload);
-    return;
+  } else {
+    state.art[artifact.artifactId] = { value: payload, history: [payload] };
+  }
+
+  for (const exposure of artifact.exposures) {
+    const effect = compileArtifactExposureEffect({
+      opId: op.opId,
+      artifact,
+      exposure,
+      value: payload,
+    });
+    if (
+      effect.type === "prompt.system_update" ||
+      effect.type === "prompt.append_after_last_user" ||
+      effect.type === "prompt.insert_at_depth"
+    ) {
+      state.messages = applyPromptEffect(state.messages, effect);
+      continue;
+    }
+    if (effect.type === "turn.assistant.replace_text") {
+      state.assistantText = effect.text;
+      continue;
+    }
+    if (effect.type === "turn.user.replace_text") {
+      const lastUserIdx = state.messages.map((m) => m.role).lastIndexOf("user");
+      if (lastUserIdx >= 0) {
+        state.messages[lastUserIdx] = { role: "user", content: effect.text };
+      }
+    }
   }
-  state.art[tag] = { value: payload, history: [payload] };
 }
 
 function buildOperationContext(
   base: InstructionRenderContext,
-  state: RuntimeState
+  state: RuntimeState,
+  operations: OperationInProfile[]
 ): InstructionRenderContext {
   return {
     ...base,
     promptSystem: resolvePromptSystem(state.messages),
-    art: { ...(base.art ?? {}), ...state.art },
+    art: { ...(base.art ?? {}), ...mapArtifactsForTemplate(operations, state.art) },
+    artByOpId: {
+      ...(base.artByOpId ?? {}),
+      ...mapArtifactsByOpId(operations, state.art),
+    },
     messages: state.messages.map((m) => ({ role: m.role, content: m.content })),
   };
 }
@@ -173,12 +150,12 @@ async function runTemplateOperations(params: {
         const rendered = normalizeText(
           await renderLiquidTemplate({
             templateText: op.config.params.template,
-            context: buildOperationContext(params.templateContext, params.state),
+            context: buildOperationContext(params.templateContext, params.state, params.profile.operations ?? []),
             options: { strictVariables: Boolean(op.config.params.strictVariables) },
           })
         );
 
-        applyOperationOutput(params.state, op.config.params.output, rendered, params.hook);
+        applyArtifactEffects(params.state, op, rendered);
         return { output: rendered };
       },
     })),
@@ -204,7 +181,7 @@ export async function applyTemplateOperationsToPromptDraft(params: {
   templateContext: InstructionRenderContext;
 }): Promise<{
   messages: PromptDraftMessage[];
-  artifacts: Record<string, { value: string; history: string[] }>;
+  artifacts: Record<string, { value: unknown; history: unknown[] }>;
 }> {
   const state: RuntimeState = {
     messages: params.draftMessages.map((m) => ({ ...m })),
@@ -233,7 +210,7 @@ export async function applyTemplateOperationsAfterMainLlm(params: {
   templateContext: InstructionRenderContext;
 }): Promise<{
   assistantText: string;
-  artifacts: Record<string, { value: string; history: string[] }>;
+  artifacts: Record<string, { value: unknown; history: unknown[] }>;
 }> {
   const state: RuntimeState = {
     messages: params.draftMessages.map((m) => ({ ...m })),
@@ -241,7 +218,6 @@ export async function applyTemplateOperationsAfterMainLlm(params: {
     assistantText: params.assistantText,
   };
 
-  // Make the generated assistant message available for after_main_llm templates.
   state.messages.push({ role: "assistant", content: state.assistantText });
 
   await runTemplateOperations({
@@ -258,3 +234,4 @@ export async function applyTemplateOperationsAfterMainLlm(params: {
     artifacts: state.art,
   };
 }
+
diff --git a/shared/types/operation-profiles.ts b/shared/types/operation-profiles.ts
index c1fa0fa3..3b13e93b 100644
--- a/shared/types/operation-profiles.ts
+++ b/shared/types/operation-profiles.ts
@@ -3,7 +3,9 @@ export type OperationTrigger = "generate" | "regenerate";
 
 export type OperationExecutionMode = "concurrent" | "sequential";
 
+export type ArtifactFormat = "text" | "markdown" | "json";
 export type ArtifactPersistence = "persisted" | "run_only";
+export type ArtifactWriteMode = "replace" | "append";
 export type ArtifactUsage = "prompt_only" | "ui_only" | "prompt+ui" | "internal";
 export type ArtifactSemantics =
   | "state"
@@ -23,14 +25,75 @@ export type OperationKind =
 
 export type PromptTimeMessageRole = "system" | "user" | "assistant";
 
-export type PromptTimeEffect =
+export type PromptPartExposure = {
+  type: "prompt_part";
+  target: "system";
+  mode: "prepend" | "append" | "replace";
+  source?: string;
+};
+
+export type PromptMessageExposure =
+  | {
+      type: "prompt_message";
+      role: PromptTimeMessageRole;
+      anchor: "after_last_user";
+      source?: string;
+    }
+  | {
+      type: "prompt_message";
+      role: PromptTimeMessageRole;
+      anchor: "depth_from_end";
+      depthFromEnd: number;
+      source?: string;
+    };
+
+export type TurnRewriteExposure = {
+  type: "turn_rewrite";
+  target: "current_user_main" | "assistant_output_main";
+  mode: "replace";
+};
+
+export type UiInlineExposure =
+  | {
+      type: "ui_inline";
+      role: PromptTimeMessageRole;
+      anchor: "after_last_user";
+      source?: string;
+    }
+  | {
+      type: "ui_inline";
+      role: PromptTimeMessageRole;
+      anchor: "depth_from_end";
+      depthFromEnd: number;
+      source?: string;
+    };
+
+export type ArtifactExposure =
+  | PromptPartExposure
+  | PromptMessageExposure
+  | TurnRewriteExposure
+  | UiInlineExposure;
+
+export type OperationArtifactConfig = {
+  artifactId: string;
+  tag: string;
+  title: string;
+  description?: string;
+  format: ArtifactFormat;
+  persistence: ArtifactPersistence;
+  writeMode: ArtifactWriteMode;
+  history: {
+    enabled: boolean;
+    maxItems: number;
+  };
+  semantics?: ArtifactSemantics;
+  exposures: ArtifactExposure[];
+};
+
+export type LegacyPromptTimeEffect =
   | {
       kind: "append_after_last_user";
       role: PromptTimeMessageRole;
-      /**
-       * Optional human-readable label to help debug where the injected message came from,
-       * e.g. "art.world_state" or "template_output".
-       */
       source?: string;
     }
   | {
@@ -40,59 +103,47 @@ export type PromptTimeEffect =
     }
   | {
       kind: "insert_at_depth";
-      /**
-       * 0 = insert at tail; N = insert N messages from the end (closer to tail).
-       */
       depthFromEnd: number;
       role: PromptTimeMessageRole;
       source?: string;
     };
 
-export type TurnCanonicalizationEffect = {
-  /**
-   * Minimal v2 UI placeholder for canonicalization.
-   * Current implementation is intentionally narrow and may expand with `effects` contract docs.
-   */
+export type LegacyTurnCanonicalizationEffect = {
   kind: "replace_text";
-  /**
-   * What part of the current turn to rewrite.
-   * - user: current user message (before_main_llm also allowed)
-   * - assistant: selected assistant variant (after_main_llm only)
-   */
   target: "user" | "assistant";
 };
 
-export type ArtifactWriteTarget = {
-  /**
-   * Invariant: to validate single-writer-per-tag at save-time, every operation must
-   * explicitly declare where it writes its output.
-   *
-   * `tag` is stored without the `art.` prefix.
-   */
+export type LegacyArtifactWriteTarget = {
   tag: string;
   persistence: ArtifactPersistence;
   usage: ArtifactUsage;
   semantics: ArtifactSemantics;
 };
 
-export type OperationOutput =
+export type LegacyOperationOutput =
   | {
       type: "artifacts";
-      writeArtifact: ArtifactWriteTarget;
+      writeArtifact: LegacyArtifactWriteTarget;
     }
   | {
       type: "prompt_time";
-      promptTime: PromptTimeEffect;
+      promptTime: LegacyPromptTimeEffect;
     }
   | {
       type: "turn_canonicalization";
-      canonicalization: TurnCanonicalizationEffect;
+      canonicalization: LegacyTurnCanonicalizationEffect;
     };
 
 export type OperationTemplateParams = {
   template: string;
   strictVariables?: boolean;
-  output: OperationOutput;
+  artifact: OperationArtifactConfig;
+};
+
+export type OperationTemplateLegacyParams = {
+  template: string;
+  strictVariables?: boolean;
+  output: LegacyOperationOutput;
 };
 
 export type LlmOperationRetryOn = "timeout" | "provider_error" | "rate_limit";
@@ -146,12 +197,13 @@ export type LlmOperationParams = {
 };
 
 export type OperationOtherKindParams<TParams extends Record<string, unknown> = Record<string, unknown>> = {
-  /**
-   * Draft UI for non-template operations:
-   * kind-specific params live here as a plain JSON object.
-   */
   params: TParams;
-  output: OperationOutput;
+  artifact: OperationArtifactConfig;
+};
+
+export type OperationOtherKindLegacyParams<TParams extends Record<string, unknown> = Record<string, unknown>> = {
+  params: TParams;
+  output: LegacyOperationOutput;
 };
 
 export type OperationParams = OperationTemplateParams | OperationOtherKindParams;
@@ -168,12 +220,12 @@ export type OperationConfig<TParams extends OperationParams = OperationParams> =
   triggers?: OperationTrigger[];
   activation?: OperationActivationConfig;
   order: number;
-  dependsOn?: string[]; // list of opId
+  dependsOn?: string[];
   params: TParams;
 };
 
 export type TemplateOperationInProfile = {
-  opId: string; // UUID
+  opId: string;
   name: string;
   description?: string;
   kind: "template";
@@ -181,7 +233,7 @@ export type TemplateOperationInProfile = {
 };
 
 export type LlmOperationInProfile = {
-  opId: string; // UUID
+  opId: string;
   name: string;
   description?: string;
   kind: "llm";
@@ -189,7 +241,7 @@ export type LlmOperationInProfile = {
 };
 
 export type GenericNonTemplateOperationInProfile = {
-  opId: string; // UUID
+  opId: string;
   name: string;
   description?: string;
   kind: Exclude<OperationKind, "template" | "llm">;
@@ -203,7 +255,7 @@ export type NonTemplateOperationInProfile =
 export type OperationInProfile = TemplateOperationInProfile | NonTemplateOperationInProfile;
 
 export type OperationBlock = {
-  blockId: string; // UUID
+  blockId: string;
   ownerId: string;
   name: string;
   description?: string;
@@ -233,24 +285,20 @@ export type OperationBlockExport = {
 };
 
 export type OperationProfileBlockRef = {
-  blockId: string; // UUID
+  blockId: string;
   enabled: boolean;
   order: number;
 };
 
 export type OperationProfile = {
-  profileId: string; // UUID
+  profileId: string;
   ownerId: string;
   name: string;
   description?: string;
   enabled: boolean;
   executionMode: OperationExecutionMode;
-  operationProfileSessionId: string; // UUID (resettable)
+  operationProfileSessionId: string;
   version: number;
-  /**
-   * Runtime-only flattened operations snapshot.
-   * Persisted profile data uses `blockRefs`.
-   */
   operations?: OperationInProfile[];
   blockRefs: OperationProfileBlockRef[];
   meta: unknown | null;
@@ -287,7 +335,6 @@ export type OperationProfileExportV2 = {
 };
 
 export type OperationProfileLegacyExportV1 = {
-  // `profileId` is intentionally optional on import.
   profileId?: string;
   name: string;
   description?: string;
@@ -305,3 +352,316 @@ export type OperationProfileSettings = {
   updatedAt: Date;
 };
 
+const DEFAULT_ARTIFACT_HISTORY_MAX_ITEMS = 20;
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function asString(value: unknown): string | undefined {
+  return typeof value === "string" ? value : undefined;
+}
+
+function asBoolean(value: unknown): boolean | undefined {
+  return typeof value === "boolean" ? value : undefined;
+}
+
+function asFiniteNumber(value: unknown): number | undefined {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+
+function normalizePositiveInteger(value: unknown, fallback: number): number {
+  const parsed = asFiniteNumber(value);
+  if (typeof parsed === "undefined") return fallback;
+  return Math.max(1, Math.floor(parsed));
+}
+
+function normalizeNonNegativeInteger(value: unknown, fallback = 0): number {
+  const parsed = asFiniteNumber(value);
+  if (typeof parsed === "undefined") return fallback;
+  return Math.max(0, Math.floor(Math.abs(parsed)));
+}
+
+function normalizePromptRole(value: unknown): PromptTimeMessageRole {
+  if (value === "system" || value === "user" || value === "assistant") return value;
+  if (value === "developer") return "system";
+  return "system";
+}
+
+export function buildOperationArtifactId(opId: string): string {
+  return `artifact:${opId}`;
+}
+
+function sanitizeArtifactTagSegment(value: string): string {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+}
+
+export function buildDefaultArtifactTag(params: { opId: string; title?: string }): string {
+  const fromTitle = typeof params.title === "string" ? sanitizeArtifactTagSegment(params.title) : "";
+  if (/^[a-z][a-z0-9_]*$/.test(fromTitle)) return fromTitle;
+
+  const suffix = params.opId.replace(/[^a-zA-Z0-9]/g, "").toLowerCase().slice(0, 8) || "item";
+  return `artifact_${suffix}`;
+}
+
+function normalizeArtifactTag(value: unknown, fallback: string): string {
+  const normalized = typeof value === "string" ? sanitizeArtifactTagSegment(value) : "";
+  return /^[a-z][a-z0-9_]*$/.test(normalized) ? normalized : fallback;
+}
+
+export function inferDefaultArtifactFormat(params: {
+  kind: OperationKind;
+  llmOutputMode?: "text" | "json";
+}): ArtifactFormat {
+  if (params.kind === "llm" && params.llmOutputMode === "json") return "json";
+  return "markdown";
+}
+
+export function makeDefaultOperationArtifactConfig(params: {
+  opId: string;
+  kind: OperationKind;
+  llmOutputMode?: "text" | "json";
+  title?: string;
+}): OperationArtifactConfig {
+  return {
+    artifactId: buildOperationArtifactId(params.opId),
+    tag: buildDefaultArtifactTag({ opId: params.opId, title: params.title }),
+    title: params.title?.trim() || `Artifact ${params.opId.slice(0, 8)}`,
+    format: inferDefaultArtifactFormat({
+      kind: params.kind,
+      llmOutputMode: params.llmOutputMode,
+    }),
+    persistence: "run_only",
+    writeMode: "replace",
+    history: {
+      enabled: true,
+      maxItems: DEFAULT_ARTIFACT_HISTORY_MAX_ITEMS,
+    },
+    exposures: [],
+  };
+}
+
+function normalizeExposure(raw: unknown): ArtifactExposure | null {
+  if (!isRecord(raw) || typeof raw.type !== "string") return null;
+
+  if (raw.type === "prompt_part") {
+    const mode =
+      raw.mode === "prepend" || raw.mode === "append" || raw.mode === "replace"
+        ? raw.mode
+        : "append";
+    return {
+      type: "prompt_part",
+      target: "system",
+      mode,
+      ...(asString(raw.source)?.trim() ? { source: asString(raw.source)!.trim() } : {}),
+    };
+  }
+
+  if (raw.type === "prompt_message" || raw.type === "ui_inline") {
+    const anchor =
+      raw.anchor === "depth_from_end" || raw.anchor === "after_last_user"
+        ? raw.anchor
+        : "after_last_user";
+    const base = {
+      type: raw.type,
+      role: normalizePromptRole(raw.role),
+      ...(asString(raw.source)?.trim() ? { source: asString(raw.source)!.trim() } : {}),
+    } as const;
+    if (anchor === "depth_from_end") {
+      return {
+        ...base,
+        anchor,
+        depthFromEnd: normalizeNonNegativeInteger(raw.depthFromEnd),
+      } as ArtifactExposure;
+    }
+    return {
+      ...base,
+      anchor,
+    } as ArtifactExposure;
+  }
+
+  if (raw.type === "turn_rewrite") {
+    return {
+      type: "turn_rewrite",
+      target:
+        raw.target === "assistant_output_main" ? "assistant_output_main" : "current_user_main",
+      mode: "replace",
+    };
+  }
+
+  return null;
+}
+
+function legacyOutputToArtifactConfig(params: {
+  opId: string;
+  kind: OperationKind;
+  title?: string;
+  llmOutputMode?: "text" | "json";
+  output: LegacyOperationOutput;
+}): OperationArtifactConfig {
+  const base = makeDefaultOperationArtifactConfig({
+    opId: params.opId,
+    kind: params.kind,
+    llmOutputMode: params.llmOutputMode,
+    title: params.title,
+  });
+
+  if (params.output.type === "artifacts") {
+    return {
+      ...base,
+      artifactId: params.output.writeArtifact.tag,
+      tag: normalizeArtifactTag(params.output.writeArtifact.tag, base.tag),
+      persistence: params.output.writeArtifact.persistence,
+      semantics: params.output.writeArtifact.semantics,
+    };
+  }
+
+  if (params.output.type === "prompt_time") {
+    if (params.output.promptTime.kind === "system_update") {
+      return {
+        ...base,
+        exposures: [
+          {
+            type: "prompt_part",
+            target: "system",
+            mode: params.output.promptTime.mode,
+            ...(params.output.promptTime.source
+              ? { source: params.output.promptTime.source }
+              : {}),
+          },
+        ],
+      };
+    }
+
+    if (params.output.promptTime.kind === "append_after_last_user") {
+      return {
+        ...base,
+        exposures: [
+          {
+            type: "prompt_message",
+            role: params.output.promptTime.role,
+            anchor: "after_last_user",
+            ...(params.output.promptTime.source
+              ? { source: params.output.promptTime.source }
+              : {}),
+          },
+        ],
+      };
+    }
+
+    return {
+      ...base,
+      exposures: [
+        {
+          type: "prompt_message",
+          role: params.output.promptTime.role,
+          anchor: "depth_from_end",
+          depthFromEnd: normalizeNonNegativeInteger(params.output.promptTime.depthFromEnd),
+          ...(params.output.promptTime.source ? { source: params.output.promptTime.source } : {}),
+        },
+      ],
+    };
+  }
+
+  return {
+    ...base,
+    exposures: [
+      {
+        type: "turn_rewrite",
+        target:
+          params.output.canonicalization.target === "assistant"
+            ? "assistant_output_main"
+            : "current_user_main",
+        mode: "replace",
+      },
+    ],
+  };
+}
+
+export function normalizeOperationArtifactConfig(params: {
+  opId: string;
+  kind: OperationKind;
+  title?: string;
+  rawParams: unknown;
+}): OperationArtifactConfig {
+  const llmOutputMode =
+    isRecord(params.rawParams) &&
+    isRecord(params.rawParams.params) &&
+    params.rawParams.params.outputMode === "json"
+      ? "json"
+      : "text";
+  const fallback = makeDefaultOperationArtifactConfig({
+    opId: params.opId,
+    kind: params.kind,
+    llmOutputMode,
+    title: params.title,
+  });
+
+  if (!isRecord(params.rawParams)) {
+    return fallback;
+  }
+
+  if (isRecord(params.rawParams.artifact)) {
+    const artifact = params.rawParams.artifact;
+    const exposures = Array.isArray(artifact.exposures)
+      ? artifact.exposures
+          .map((item) => normalizeExposure(item))
+          .filter((item): item is ArtifactExposure => Boolean(item))
+      : [];
+    const rawArtifactId = asString(artifact.artifactId)?.trim();
+    const rawTag = asString(artifact.tag)?.trim();
+    const migratedLegacyTag = !rawTag && rawArtifactId && !rawArtifactId.startsWith("artifact:") ? rawArtifactId : undefined;
+    return {
+      artifactId: rawArtifactId || fallback.artifactId,
+      tag: normalizeArtifactTag(rawTag ?? migratedLegacyTag, fallback.tag),
+      title: asString(artifact.title)?.trim() || fallback.title,
+      description: asString(artifact.description)?.trim() || undefined,
+      format:
+        artifact.format === "text" || artifact.format === "markdown" || artifact.format === "json"
+          ? artifact.format
+          : fallback.format,
+      persistence:
+        artifact.persistence === "persisted" || artifact.persistence === "run_only"
+          ? artifact.persistence
+          : fallback.persistence,
+      writeMode:
+        artifact.writeMode === "append" || artifact.writeMode === "replace"
+          ? artifact.writeMode
+          : fallback.writeMode,
+      history: {
+        enabled: asBoolean(isRecord(artifact.history) ? artifact.history.enabled : undefined) ?? true,
+        maxItems: normalizePositiveInteger(
+          isRecord(artifact.history) ? artifact.history.maxItems : undefined,
+          fallback.history.maxItems
+        ),
+      },
+      semantics: asString(artifact.semantics)?.trim() || undefined,
+      exposures,
+    };
+  }
+
+  if (isRecord(params.rawParams.output) && typeof params.rawParams.output.type === "string") {
+    return legacyOutputToArtifactConfig({
+      opId: params.opId,
+      kind: params.kind,
+      title: params.title,
+      llmOutputMode,
+      output: params.rawParams.output as LegacyOperationOutput,
+    });
+  }
+
+  if (isRecord(params.rawParams.writeArtifact)) {
+    return legacyOutputToArtifactConfig({
+      opId: params.opId,
+      kind: params.kind,
+      title: params.title,
+      llmOutputMode,
+      output: {
+        type: "artifacts",
+        writeArtifact: params.rawParams.writeArtifact as LegacyArtifactWriteTarget,
+      },
+    });
+  }
+
+  return fallback;
+}
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
index cab96c99..b97ad8ad 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
@@ -1,23 +1,26 @@
 import { v4 as uuidv4 } from 'uuid';
 
 import type { OperationProfileDto } from '../../../../api/chat-core';
-import type {
-	LlmOperationParams,
-	LlmOperationRetryOn,
-	LlmOperationSamplers,
-	OperationInProfile,
-	OperationKind,
-	OperationOutput,
-	OperationTemplateParams,
+import {
+	buildOperationArtifactId,
+	makeDefaultOperationArtifactConfig,
+	normalizeOperationArtifactConfig,
+	type LlmOperationParams,
+	type LlmOperationRetryOn,
+	type LlmOperationSamplers,
+	type OperationArtifactConfig,
+	type OperationInProfile,
+	type OperationKind,
+	type OperationTemplateParams,
 } from '@shared/types/operation-profiles';
 
-export type FormTemplateParams = OperationTemplateParams & {
+export type FormTemplateParams = Omit<OperationTemplateParams, 'strictVariables'> & {
 	strictVariables: boolean;
 };
 
 export type FormOtherKindParams = {
 	paramsJson: string;
-	output: OperationOutput;
+	artifact: OperationArtifactConfig;
 };
 
 export type FormLlmKindParams = {
@@ -41,7 +44,7 @@ export type FormLlmKindParams = {
 		backoffMs: number;
 		retryOn: LlmOperationRetryOn[];
 	};
-	output: OperationOutput;
+	artifact: OperationArtifactConfig;
 };
 
 export type FormOperation = {
@@ -73,20 +76,17 @@ export type OperationProfileFormValues = {
 	operations: FormOperation[];
 };
 
-export function makeDefaultArtifactOutput(): Extract<OperationOutput, { type: 'artifacts' }> {
-	return {
-		type: 'artifacts',
-		writeArtifact: {
-			tag: `artifact_${Math.random().toString(16).slice(2, 8)}`,
-			persistence: 'run_only',
-			usage: 'internal',
-			semantics: 'intermediate',
-		},
-	};
+export function makeDefaultArtifactOutput(opId = uuidv4(), kind: OperationKind = 'template'): OperationArtifactConfig {
+	return makeDefaultOperationArtifactConfig({
+		opId,
+		kind,
+		title: 'Artifact',
+	});
 }
 
 export function makeDefaultLlmKindParams(
-	output: OperationOutput = makeDefaultArtifactOutput(),
+	opId: string,
+	artifact: OperationArtifactConfig = makeDefaultArtifactOutput(opId, 'llm'),
 ): FormLlmKindParams {
 	return {
 		providerId: 'openrouter',
@@ -109,123 +109,49 @@ export function makeDefaultLlmKindParams(
 			backoffMs: 0,
 			retryOn: ['timeout', 'provider_error', 'rate_limit'],
 		},
-		output,
+		artifact,
 	};
 }
 
 export function makeDefaultOtherKindParams(
-	output: OperationOutput = makeDefaultArtifactOutput(),
+	opId: string,
+	kind: Exclude<OperationKind, 'template' | 'llm'>,
+	artifact: OperationArtifactConfig = makeDefaultArtifactOutput(opId, kind),
 ): FormOtherKindParams {
 	return {
 		paramsJson: '{\n  \n}',
-		output,
+		artifact,
 	};
 }
 
-function normalizePromptTimeRole(value: unknown): 'system' | 'user' | 'assistant' {
-	if (value === 'user' || value === 'assistant' || value === 'system') return value;
-	if (value === 'developer') return 'system';
-	return 'system';
-}
-
-function normalizeDepthFromEnd(value: unknown): number {
-	if (typeof value !== 'number' || !Number.isFinite(value)) return 0;
-	return Math.max(0, Math.floor(Math.abs(value)));
-}
-
-function normalizeOperationOutput(output: unknown, fallback: OperationOutput): OperationOutput {
-	if (!output || typeof output !== 'object') return fallback;
-	const raw = output as Record<string, unknown>;
-	if (raw.type !== 'prompt_time') return output as OperationOutput;
-
-	const promptTime = raw.promptTime;
-	if (!promptTime || typeof promptTime !== 'object') return fallback;
-	const pt = promptTime as Record<string, unknown>;
-
-	if (pt.kind === 'append_after_last_user') {
-		return {
-			type: 'prompt_time',
-			promptTime: {
-				kind: 'append_after_last_user',
-				role: normalizePromptTimeRole(pt.role),
-				source: typeof pt.source === 'string' ? pt.source : undefined,
-			},
-		};
+function toNonNegativeInteger(value: unknown): number {
+	if (typeof value === 'number' && Number.isFinite(value)) {
+		return Math.max(0, Math.floor(value));
 	}
-
-	if (pt.kind === 'insert_at_depth') {
-		return {
-			type: 'prompt_time',
-			promptTime: {
-				kind: 'insert_at_depth',
-				depthFromEnd: normalizeDepthFromEnd(pt.depthFromEnd),
-				role: normalizePromptTimeRole(pt.role),
-				source: typeof pt.source === 'string' ? pt.source : undefined,
-			},
-		};
+	if (typeof value === 'string') {
+		const normalized = value.trim().replace(',', '.');
+		if (normalized.length === 0) return 0;
+		const parsed = Number(normalized);
+		if (Number.isFinite(parsed)) return Math.max(0, Math.floor(parsed));
 	}
-
-	return output as OperationOutput;
+	return 0;
 }
 
-function normalizeTemplateParams(params: unknown): OperationTemplateParams {
-	if (!params || typeof params !== 'object') {
-		return {
-			template: '',
-			strictVariables: false,
-			output: {
-				type: 'artifacts',
-				writeArtifact: makeDefaultArtifactOutput().writeArtifact,
-			},
-		};
-	}
-
-	const p = params as any;
-	if (p.output && typeof p.output === 'object') {
-		return {
-			template: typeof p.template === 'string' ? p.template : '',
-			strictVariables: Boolean(p.strictVariables),
-			output: normalizeOperationOutput(p.output, makeDefaultArtifactOutput()),
-		};
-	}
-
-	// Legacy compatibility: params.writeArtifact -> params.output.type="artifacts"
-	if (p.writeArtifact && typeof p.writeArtifact === 'object') {
-		return {
-			template: typeof p.template === 'string' ? p.template : '',
-			strictVariables: Boolean(p.strictVariables),
-			output: {
-				type: 'artifacts',
-				writeArtifact: p.writeArtifact,
-			},
-		};
+function normalizeActivation(value: unknown): { everyNTurns: number; everyNContextTokens: number } {
+	if (!value || typeof value !== 'object') {
+		return { everyNTurns: 0, everyNContextTokens: 0 };
 	}
-
+	const raw = value as Record<string, unknown>;
+	const normalize = (input: unknown): number => {
+		const parsed = toNonNegativeInteger(input);
+		return parsed >= 1 ? parsed : 0;
+	};
 	return {
-		template: typeof p.template === 'string' ? p.template : '',
-		strictVariables: Boolean(p.strictVariables),
-		output: {
-			type: 'artifacts',
-			writeArtifact: {
-				tag: `artifact_${Math.random().toString(16).slice(2, 8)}`,
-				persistence: 'run_only',
-				usage: 'internal',
-				semantics: 'intermediate',
-			},
-		},
+		everyNTurns: normalize(raw.everyNTurns),
+		everyNContextTokens: normalize(raw.everyNContextTokens),
 	};
 }
 
-function normalizeOtherKindParams(params: unknown): FormOtherKindParams {
-	const defaultOutput = makeDefaultArtifactOutput();
-	if (!params || typeof params !== 'object') return makeDefaultOtherKindParams(defaultOutput);
-
-	const p = params as any;
-	const output: OperationOutput = normalizeOperationOutput(p.output, defaultOutput);
-	const rawParams = p.params && typeof p.params === 'object' && !Array.isArray(p.params) ? (p.params as Record<string, unknown>) : {};
-	return { paramsJson: JSON.stringify(rawParams, null, 2), output };
-}
-
 function pickNumericSamplers(raw: unknown): LlmOperationSamplers {
 	if (!raw || typeof raw !== 'object') return {};
 	const r = raw as Record<string, unknown>;
@@ -261,54 +187,58 @@ function normalizeRetryOn(value: unknown): LlmOperationRetryOn[] {
 	return unique.length > 0 ? unique : ['timeout', 'provider_error', 'rate_limit'];
 }
 
-function toNonNegativeInteger(value: unknown): number {
-	if (typeof value === 'number' && Number.isFinite(value)) {
-		return Math.max(0, Math.floor(value));
-	}
-	if (typeof value === 'string') {
-		const normalized = value.trim().replace(',', '.');
-		if (normalized.length === 0) return 0;
-		const parsed = Number(normalized);
-		if (Number.isFinite(parsed)) return Math.max(0, Math.floor(parsed));
-	}
-	return 0;
+function normalizeTemplateParams(op: OperationInProfile): FormTemplateParams {
+	const params = op.config.params as Record<string, unknown>;
+	return {
+		template: typeof params.template === 'string' ? params.template : '',
+		strictVariables: Boolean(params.strictVariables),
+		artifact: normalizeOperationArtifactConfig({
+			opId: op.opId,
+			kind: op.kind,
+			title: op.name,
+			rawParams: params,
+		}),
+	};
 }
 
-function normalizeActivation(value: unknown): { everyNTurns: number; everyNContextTokens: number } {
-	if (!value || typeof value !== 'object') {
-		return { everyNTurns: 0, everyNContextTokens: 0 };
-	}
-	const raw = value as Record<string, unknown>;
-	const normalize = (input: unknown): number => {
-		const parsed = toNonNegativeInteger(input);
-		return parsed >= 1 ? parsed : 0;
-	};
+function normalizeOtherKindParams(op: OperationInProfile): FormOtherKindParams {
+	const params = op.config.params as Record<string, unknown>;
+	const rawParams =
+		params.params && typeof params.params === 'object' && !Array.isArray(params.params)
+			? (params.params as Record<string, unknown>)
+			: {};
 	return {
-		everyNTurns: normalize(raw.everyNTurns),
-		everyNContextTokens: normalize(raw.everyNContextTokens),
+		paramsJson: JSON.stringify(rawParams, null, 2),
+		artifact: normalizeOperationArtifactConfig({
+			opId: op.opId,
+			kind: op.kind,
+			title: op.name,
+			rawParams: params,
+		}),
 	};
 }
 
-function normalizeLlmKindParams(params: unknown): FormLlmKindParams {
-	if (!params || typeof params !== 'object') return makeDefaultLlmKindParams();
-
-	const raw = params as any;
-	const llmParamsRaw = raw.params && typeof raw.params === 'object' ? raw.params : {};
-	const output: OperationOutput =
-		normalizeOperationOutput(raw.output, makeDefaultArtifactOutput());
-
-	const base = makeDefaultLlmKindParams(output);
+function normalizeLlmKindParams(op: Extract<OperationInProfile, { kind: 'llm' }>): FormLlmKindParams {
+	const raw = op.config.params as Record<string, unknown>;
+	const llmParamsRaw = raw.params && typeof raw.params === 'object' ? (raw.params as Record<string, unknown>) : {};
 	const providerId = llmParamsRaw.providerId === 'openai_compatible' ? 'openai_compatible' : 'openrouter';
 	const outputMode = llmParamsRaw.outputMode === 'json' ? 'json' : 'text';
 	const jsonParseMode =
 		llmParamsRaw.jsonParseMode === 'markdown_code_block' || llmParamsRaw.jsonParseMode === 'custom_regex'
 			? llmParamsRaw.jsonParseMode
 			: 'raw';
-	const retryRaw = llmParamsRaw.retry && typeof llmParamsRaw.retry === 'object' ? llmParamsRaw.retry : {};
+	const retryRaw = llmParamsRaw.retry && typeof llmParamsRaw.retry === 'object' ? (llmParamsRaw.retry as Record<string, unknown>) : {};
 
 	return {
-		...base,
-		output,
+		...makeDefaultLlmKindParams(
+			op.opId,
+			normalizeOperationArtifactConfig({
+				opId: op.opId,
+				kind: op.kind,
+				title: op.name,
+				rawParams: raw,
+			}),
+		),
 		providerId,
 		credentialRef: typeof llmParamsRaw.credentialRef === 'string' ? llmParamsRaw.credentialRef : '',
 		model: typeof llmParamsRaw.model === 'string' ? llmParamsRaw.model : '',
@@ -320,23 +250,23 @@ function normalizeLlmKindParams(params: unknown): FormLlmKindParams {
 		jsonCustomPattern: typeof llmParamsRaw.jsonCustomPattern === 'string' ? llmParamsRaw.jsonCustomPattern : '',
 		jsonCustomFlags: typeof llmParamsRaw.jsonCustomFlags === 'string' ? llmParamsRaw.jsonCustomFlags : '',
 		jsonSchemaText:
-			typeof llmParamsRaw.jsonSchema === 'undefined'
-				? ''
-				: JSON.stringify(llmParamsRaw.jsonSchema, null, 2),
+			typeof llmParamsRaw.jsonSchema === 'undefined' ? '' : JSON.stringify(llmParamsRaw.jsonSchema, null, 2),
 		strictSchemaValidation: llmParamsRaw.strictSchemaValidation === true,
 		samplerPresetId: typeof llmParamsRaw.samplerPresetId === 'string' ? llmParamsRaw.samplerPresetId : '',
 		samplers: pickNumericSamplers(llmParamsRaw.samplers),
 		timeoutMs:
-			typeof llmParamsRaw.timeoutMs === 'number' && Number.isFinite(llmParamsRaw.timeoutMs) ? llmParamsRaw.timeoutMs : base.timeoutMs,
+			typeof llmParamsRaw.timeoutMs === 'number' && Number.isFinite(llmParamsRaw.timeoutMs)
+				? llmParamsRaw.timeoutMs
+				: 60000,
 		retry: {
 			maxAttempts:
 				typeof retryRaw.maxAttempts === 'number' && Number.isFinite(retryRaw.maxAttempts)
 					? Math.max(1, Math.floor(retryRaw.maxAttempts))
-					: base.retry.maxAttempts,
+					: 1,
 			backoffMs:
 				typeof retryRaw.backoffMs === 'number' && Number.isFinite(retryRaw.backoffMs)
 					? Math.max(0, Math.floor(retryRaw.backoffMs))
-					: base.retry.backoffMs,
+					: 0,
 			retryOn: normalizeRetryOn(retryRaw.retryOn),
 		},
 	};
@@ -364,13 +294,10 @@ export function toOperationProfileForm(profile: OperationProfileDto): OperationP
 				order: Number((op.config as any).order ?? 0),
 				params:
 					op.kind === 'template'
-						? ({
-								...normalizeTemplateParams(op.config.params as unknown),
-								strictVariables: Boolean((op.config.params as any)?.strictVariables),
-							} satisfies FormTemplateParams)
+						? normalizeTemplateParams(op)
 						: op.kind === 'llm'
-							? (normalizeLlmKindParams(op.config.params as unknown) satisfies FormLlmKindParams)
-						: (normalizeOtherKindParams(op.config.params as unknown) satisfies FormOtherKindParams),
+							? normalizeLlmKindParams(op)
+							: normalizeOtherKindParams(op),
 			},
 		})),
 	};
@@ -421,7 +348,10 @@ export function fromOperationProfileForm(
 						params: {
 							template: params.template,
 							strictVariables: params.strictVariables ? true : undefined,
-							output: params.output,
+							artifact: {
+								...params.artifact,
+								artifactId: params.artifact.artifactId || buildOperationArtifactId(op.opId),
+							},
 						},
 					},
 				};
@@ -436,12 +366,8 @@ export function fromOperationProfileForm(
 				const jsonCustomFlags = params.jsonCustomFlags.trim();
 				const jsonSchemaText = params.jsonSchemaText.trim();
 				const timeoutMs = Number.isFinite(params.timeoutMs) ? Math.max(1, Math.floor(params.timeoutMs)) : undefined;
-				const retryMaxAttempts = Number.isFinite(params.retry.maxAttempts)
-					? Math.max(1, Math.floor(params.retry.maxAttempts))
-					: 1;
-				const retryBackoffMs = Number.isFinite(params.retry.backoffMs)
-					? Math.max(0, Math.floor(params.retry.backoffMs))
-					: 0;
+				const retryMaxAttempts = Number.isFinite(params.retry.maxAttempts) ? Math.max(1, Math.floor(params.retry.maxAttempts)) : 1;
+				const retryBackoffMs = Number.isFinite(params.retry.backoffMs) ? Math.max(0, Math.floor(params.retry.backoffMs)) : 0;
 				const retryOn = normalizeRetryOn(params.retry.retryOn);
 				const samplers = pickNumericSamplers(params.samplers);
 				const hasSamplers = Object.keys(samplers).length > 0;
@@ -497,7 +423,10 @@ export function fromOperationProfileForm(
 									retryOn,
 								},
 							},
-							output: params.output,
+							artifact: {
+								...params.artifact,
+								artifactId: params.artifact.artifactId || buildOperationArtifactId(op.opId),
+							},
 						},
 					},
 				};
@@ -509,8 +438,8 @@ export function fromOperationProfileForm(
 			if (raw) {
 				try {
 					parsed = JSON.parse(raw) as unknown;
-				} catch (e) {
-					if (options?.validateJson) throw e;
+				} catch (error) {
+					if (options?.validateJson) throw error;
 					parsed = {};
 				}
 			}
@@ -531,7 +460,10 @@ export function fromOperationProfileForm(
 					dependsOn: op.config.dependsOn?.length ? op.config.dependsOn : undefined,
 					params: {
 						params: asObj,
-						output: params.output,
+						artifact: {
+							...params.artifact,
+							artifactId: params.artifact.artifactId || buildOperationArtifactId(op.opId),
+						},
 					},
 				},
 			};
@@ -540,8 +472,9 @@ export function fromOperationProfileForm(
 }
 
 export function makeDefaultOperation(): FormOperation {
+	const opId = uuidv4();
 	return {
-		opId: uuidv4(),
+		opId,
 		name: 'New operation',
 		description: '',
 		kind: 'template',
@@ -559,7 +492,7 @@ export function makeDefaultOperation(): FormOperation {
 			params: {
 				template: '',
 				strictVariables: false,
-				output: makeDefaultArtifactOutput(),
+				artifact: makeDefaultArtifactOutput(opId, 'template'),
 			},
 		},
 	};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
index 32435e68..5e20ea02 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
@@ -38,15 +38,7 @@ type Props = {
 	onRemove?: () => void;
 };
 
-const kindOptions = [
-	{ value: 'template', label: 'template' },
-	{ value: 'llm', label: 'llm' },
-	{ value: 'rag', label: 'rag' },
-	{ value: 'tool', label: 'tool' },
-	{ value: 'compute', label: 'compute' },
-	{ value: 'transform', label: 'transform' },
-	{ value: 'legacy', label: 'legacy' },
-];
+const kindOptions = ['template', 'llm', 'rag', 'tool', 'compute', 'transform', 'legacy'] as const;
 
 function isOperationKind(value: unknown): value is OperationKind {
 	return (
@@ -68,7 +60,7 @@ function makeSafeOutput(output: unknown) {
 export const OperationEditor: React.FC<Props> = memo(({ index, title, status, canSave, canDiscard, onSave, onDiscard, onRemove }) => {
 	const { t } = useTranslation();
 	const opId = useWatch({ name: `operations.${index}.opId` }) as unknown;
-	const output = useWatch({ name: `operations.${index}.config.params.output` }) as unknown;
+	const artifact = useWatch({ name: `operations.${index}.config.params.artifact` }) as unknown;
 	const { setValue, control } = useFormContext();
 
 	const {
@@ -89,7 +81,7 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 					{status && (
 						<>
 							<Badge variant="light">#{status.index}</Badge>
-							<Badge variant="outline">{status.kind}</Badge>
+							<Badge variant="outline">{t(`operationProfiles.kind.${status.kind}`)}</Badge>
 							{status.isDirty && <Badge color="yellow">{t('operationProfiles.operationEditor.unsaved')}</Badge>}
 						</>
 					)}
@@ -130,31 +122,38 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 				<Select
 					{...kindField}
 					label={t('operationProfiles.fields.kind')}
-					data={kindOptions}
+					data={kindOptions.map((kind) => ({ value: kind, label: t(`operationProfiles.kind.${kind}`) }))}
 					value={normalizedKind}
 					onChange={(next) => {
 						const nextKind: OperationKind = isOperationKind(next) ? next : 'template';
 						onKindChange(nextKind);
 
-						const safeOutput = makeSafeOutput(output);
+						const safeArtifact = makeSafeOutput(artifact);
 
 						if (nextKind === 'template') {
 							const nextParams: FormTemplateParams = {
 								template: '',
 								strictVariables: false,
-								output: safeOutput as FormTemplateParams['output'],
+								artifact: safeArtifact as FormTemplateParams['artifact'],
 							};
 							setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
 							return;
 						}
 
 						if (nextKind === 'llm') {
-							const nextParams: FormLlmKindParams = makeDefaultLlmKindParams(safeOutput as FormLlmKindParams['output']);
+							const nextParams: FormLlmKindParams = makeDefaultLlmKindParams(
+								safeOpId || 'temp-op',
+								safeArtifact as FormLlmKindParams['artifact'],
+							);
 							setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
 							return;
 						}
 
-						const nextParams: FormOtherKindParams = makeDefaultOtherKindParams(safeOutput as FormOtherKindParams['output']);
+						const nextParams: FormOtherKindParams = makeDefaultOtherKindParams(
+							safeOpId || 'temp-op',
+							nextKind as Exclude<OperationKind, 'template' | 'llm'>,
+							safeArtifact as FormOtherKindParams['artifact'],
+						);
 						setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
 					}}
 					comboboxProps={{ withinPortal: false }}
@@ -164,7 +163,7 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 			</Group>
 
 			<Text size="xs" c="dimmed" className="op-opIdText">
-				{t('operationProfiles.fields.opId', { value: safeOpId || '—' })}
+				{t('operationProfiles.fields.opId', { value: safeOpId || '-' })}
 			</Text>
 
 			<OperationSectionsAccordion index={index} kind={normalizedKind} />
@@ -173,3 +172,5 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 });
 
 OperationEditor.displayName = 'OperationEditor';
+
+
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
index 3f9ca6bc..30135ad4 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
@@ -1,73 +1,57 @@
-import { Group, Select, Stack, Text } from '@mantine/core';
+import { Button, Group, Paper, Select, Stack, Text } from '@mantine/core';
 import React from 'react';
-import { useController, useFormContext } from 'react-hook-form';
+import { Controller, useFieldArray, useFormContext, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
-import { FormInput, FormNumberInput, FormSelect } from '@ui/form-components';
+import { FormCheckbox, FormInput, FormNumberInput, FormSelect } from '@ui/form-components';
 
-import { makeDefaultArtifactOutput } from '../../../form/operation-profile-form-mapping';
+import type { ArtifactExposure } from '@shared/types/operation-profiles';
 
-type OutputType = 'artifacts' | 'prompt_time' | 'turn_canonicalization';
+const formatOptions = ['text', 'markdown', 'json'] as const;
 
-const outputTypeOptions = [
-	{ value: 'artifacts', label: 'operationProfiles.outputType.artifacts' },
-	{ value: 'prompt_time', label: 'operationProfiles.outputType.promptTime' },
-	{ value: 'turn_canonicalization', label: 'operationProfiles.outputType.turnCanonicalization' },
-];
+const persistenceOptions = ['persisted', 'run_only'] as const;
 
-const persistenceOptions = [
-	{ value: 'persisted', label: 'persisted' },
-	{ value: 'run_only', label: 'run_only' },
-];
+const writeModeOptions = ['replace', 'append'] as const;
 
-const usageOptions = [
-	{ value: 'prompt_only', label: 'prompt_only' },
-	{ value: 'ui_only', label: 'ui_only' },
-	{ value: 'prompt+ui', label: 'prompt+ui' },
-	{ value: 'internal', label: 'internal' },
-];
+const promptPartModeOptions = ['prepend', 'append', 'replace'] as const;
 
-const promptTimeRoleOptions = [
-	{ value: 'system', label: 'system' },
-	{ value: 'user', label: 'user' },
-	{ value: 'assistant', label: 'assistant' },
+const exposureTypeOptions = [
+	{ value: 'prompt_part', label: 'operationProfiles.exposureType.promptPart' },
+	{ value: 'prompt_message', label: 'operationProfiles.exposureType.promptMessage' },
+	{ value: 'turn_rewrite', label: 'operationProfiles.exposureType.turnRewrite' },
+	{ value: 'ui_inline', label: 'operationProfiles.exposureType.uiInline' },
 ];
 
-const promptTimeKindOptions = [
-	{ value: 'append_after_last_user', label: 'operationProfiles.promptTimeKind.appendAfterLastUser' },
-	{ value: 'system_update', label: 'operationProfiles.promptTimeKind.systemUpdate' },
-	{ value: 'insert_at_depth', label: 'operationProfiles.promptTimeKind.insertAtDepth' },
-];
+const roleOptions = ['system', 'user', 'assistant'] as const;
 
-const systemUpdateModeOptions = [
-	{ value: 'prepend', label: 'prepend' },
-	{ value: 'append', label: 'append' },
-	{ value: 'replace', label: 'replace' },
+const anchorOptions = [
+	{ value: 'after_last_user', key: 'operationProfiles.anchor.afterLastUser' },
+	{ value: 'depth_from_end', key: 'operationProfiles.anchor.depthFromEnd' },
 ];
 
-function makeDefaultArtifactsOutput() {
-	return { type: 'artifacts' as const, writeArtifact: makeDefaultArtifactOutput().writeArtifact };
-}
+const targetOptions = [
+	{ value: 'current_user_main', key: 'operationProfiles.rewriteTarget.currentUserMain' },
+	{ value: 'assistant_output_main', key: 'operationProfiles.rewriteTarget.assistantOutputMain' },
+];
 
-function makeDefaultPromptTimeOutput() {
-	return {
-		type: 'prompt_time' as const,
-		promptTime: {
-			kind: 'append_after_last_user' as const,
-			role: 'system' as const,
-			source: 'template_output',
-		},
-	};
+function makeDefaultExposure(type: ArtifactExposure['type']): ArtifactExposure {
+	if (type === 'prompt_part') {
+		return { type, target: 'system', mode: 'append' };
+	}
+	if (type === 'prompt_message') {
+		return { type, role: 'system', anchor: 'after_last_user' };
+	}
+	if (type === 'turn_rewrite') {
+		return { type, target: 'current_user_main', mode: 'replace' };
+	}
+	return { type: 'ui_inline', role: 'assistant', anchor: 'after_last_user' };
 }
 
-function makeDefaultTurnCanonicalizationOutput() {
-	return {
-		type: 'turn_canonicalization' as const,
-		canonicalization: {
-			kind: 'replace_text' as const,
-			target: 'user' as const,
-		},
-	};
+function getExposureCardTitle(t: (key: string) => string, exposure: ArtifactExposure): string {
+	if (exposure.type === 'prompt_part') return t('operationProfiles.exposureType.promptPart');
+	if (exposure.type === 'prompt_message') return t('operationProfiles.exposureType.promptMessage');
+	if (exposure.type === 'turn_rewrite') return t('operationProfiles.exposureType.turnRewrite');
+	return t('operationProfiles.exposureType.uiInline');
 }
 
 type Props = {
@@ -77,191 +61,219 @@ type Props = {
 export const OutputSection: React.FC<Props> = ({ index }) => {
 	const { t } = useTranslation();
 	const { control, setValue } = useFormContext();
+	const translatedAnchorOptions = anchorOptions.map((option) => ({ value: option.value, label: t(option.key) }));
+	const translatedTargetOptions = targetOptions.map((option) => ({ value: option.value, label: t(option.key) }));
+	const artifact = useWatch({ control, name: `operations.${index}.config.params.artifact` }) as
+		| {
+				artifactId?: string;
+				exposures?: ArtifactExposure[];
+		  }
+		| undefined;
 
-	const {
-		field: { value: outputType, onChange: onOutputTypeChange, ...outputTypeField },
-	} = useController({
+	const exposuresArray = useFieldArray({
 		control,
-		name: `operations.${index}.config.params.output.type`,
+		name: `operations.${index}.config.params.artifact.exposures`,
 	});
 
-	const normalizedType: OutputType =
-		outputType === 'artifacts' || outputType === 'prompt_time' || outputType === 'turn_canonicalization'
-			? outputType
-			: 'artifacts';
+	return (
+		<Stack gap="md">
+			<Stack gap="xs">
+				<Text size="sm" c="dimmed">
+					{t('operationProfiles.outputNotes.artifactModel')}
+				</Text>
+				<Text size="sm" c="dimmed">
+					{t('operationProfiles.outputNotes.referenceByTag')}
+				</Text>
+				<Text size="xs" c="dimmed">
+					{t('operationProfiles.sectionsLabels.artifactId')}: {artifact?.artifactId ?? '-'}
+				</Text>
+			</Stack>
 
-	const {
-		field: { value: promptTimeKindValue, onChange: onPromptTimeKindChange, ...promptTimeKindField },
-	} = useController({
-		control,
-		name: `operations.${index}.config.params.output.promptTime.kind`,
-	});
+			<Group grow wrap="wrap">
+				<FormInput
+					name={`operations.${index}.config.params.artifact.tag`}
+					label={t('operationProfiles.sectionsLabels.tag')}
+					infoTip={t('operationProfiles.tooltips.tag')}
+				/>
+				<FormInput
+					name={`operations.${index}.config.params.artifact.title`}
+					label={t('operationProfiles.sectionsLabels.artifactTitle')}
+					infoTip={t('operationProfiles.tooltips.artifactTitle')}
+				/>
+				<FormSelect
+					name={`operations.${index}.config.params.artifact.format`}
+					label={t('operationProfiles.sectionsLabels.format')}
+					infoTip={t('operationProfiles.tooltips.format')}
+					selectProps={{ options: formatOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })), comboboxProps: { withinPortal: false } }}
+				/>
+			</Group>
 
-	const promptKind =
-		promptTimeKindValue === 'append_after_last_user' ||
-		promptTimeKindValue === 'system_update' ||
-		promptTimeKindValue === 'insert_at_depth'
-			? promptTimeKindValue
-			: 'append_after_last_user';
+			<Group grow wrap="wrap">
+				<FormSelect
+					name={`operations.${index}.config.params.artifact.persistence`}
+					label={t('operationProfiles.sectionsLabels.persistence')}
+					infoTip={t('operationProfiles.tooltips.persistence')}
+					selectProps={{ options: persistenceOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })), comboboxProps: { withinPortal: false } }}
+				/>
+				<FormSelect
+					name={`operations.${index}.config.params.artifact.writeMode`}
+					label={t('operationProfiles.sectionsLabels.writeMode')}
+					infoTip={t('operationProfiles.tooltips.writeMode')}
+					selectProps={{ options: writeModeOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })), comboboxProps: { withinPortal: false } }}
+				/>
+			</Group>
 
-	return (
-		<Stack gap="xs">
-			<Select
-				{...outputTypeField}
-				label={t('operationProfiles.sectionsLabels.effectType')}
-				data={outputTypeOptions.map((o) => ({ ...o, label: t(o.label) }))}
-				value={normalizedType}
-				onChange={(next) => {
-					const nextType: OutputType = (next as OutputType) ?? 'artifacts';
-					onOutputTypeChange(nextType);
-					if (nextType === 'artifacts') {
-						setValue(`operations.${index}.config.params.output`, makeDefaultArtifactsOutput(), { shouldDirty: true });
-					}
-					if (nextType === 'prompt_time') {
-						setValue(`operations.${index}.config.params.output`, makeDefaultPromptTimeOutput(), { shouldDirty: true });
-					}
-					if (nextType === 'turn_canonicalization') {
-						setValue(`operations.${index}.config.params.output`, makeDefaultTurnCanonicalizationOutput(), { shouldDirty: true });
-					}
-				}}
-				comboboxProps={{ withinPortal: false }}
-				description={t('operationProfiles.tooltips.effectType')}
+			<Group grow wrap="wrap">
+				<FormInput
+					name={`operations.${index}.config.params.artifact.semantics`}
+					label={t('operationProfiles.sectionsLabels.semantics')}
+					infoTip={t('operationProfiles.tooltips.semantics')}
+				/>
+				<FormNumberInput
+					name={`operations.${index}.config.params.artifact.history.maxItems`}
+					label={t('operationProfiles.sectionsLabels.historyMaxItems')}
+					infoTip={t('operationProfiles.tooltips.historyMaxItems')}
+					numberInputProps={{ min: 1, step: 1 }}
+				/>
+			</Group>
+
+			<FormCheckbox
+				name={`operations.${index}.config.params.artifact.history.enabled`}
+				label={t('operationProfiles.sectionsLabels.historyEnabled')}
 			/>
 
-			{normalizedType === 'artifacts' && (
-				<Stack gap="xs">
-					<Group grow wrap="wrap">
-						<FormInput
-							name={`operations.${index}.config.params.output.writeArtifact.tag`}
-							label={t('operationProfiles.sectionsLabels.artifactTag')}
-							infoTip={t('operationProfiles.tooltips.artifactTag')}
-						/>
-						<FormSelect
-							name={`operations.${index}.config.params.output.writeArtifact.persistence`}
-							label={t('operationProfiles.sectionsLabels.persistence')}
-							infoTip={t('operationProfiles.tooltips.persistence')}
-							selectProps={{ options: persistenceOptions, comboboxProps: { withinPortal: false } }}
-						/>
-					</Group>
-					<Group grow wrap="wrap">
-						<FormSelect
-							name={`operations.${index}.config.params.output.writeArtifact.usage`}
-							label={t('operationProfiles.sectionsLabels.usage')}
-							infoTip={t('operationProfiles.tooltips.usage')}
-							selectProps={{ options: usageOptions, comboboxProps: { withinPortal: false } }}
-						/>
-						<FormInput
-							name={`operations.${index}.config.params.output.writeArtifact.semantics`}
-							label={t('operationProfiles.sectionsLabels.semantics')}
-							infoTip={t('operationProfiles.tooltips.semantics')}
-						/>
-					</Group>
-				</Stack>
-			)}
+			<FormInput
+				name={`operations.${index}.config.params.artifact.description`}
+				label={t('operationProfiles.sectionsLabels.artifactDescription')}
+				infoTip={t('operationProfiles.tooltips.artifactDescription')}
+			/>
 
-			{normalizedType === 'prompt_time' && (
-				<Stack gap="xs">
-					<Select
-						{...promptTimeKindField}
-						label={t('operationProfiles.sectionsLabels.promptTimeEffect')}
-						description={t('operationProfiles.tooltips.promptTimeEffect')}
-						data={promptTimeKindOptions.map((o) => ({ ...o, label: t(o.label) }))}
-						value={promptKind}
-						onChange={(next) => {
-							const nextKind = (next as typeof promptTimeKindOptions[number]['value']) ?? 'append_after_last_user';
-							onPromptTimeKindChange(nextKind);
-							if (nextKind === 'system_update') {
-								setValue(
-									`operations.${index}.config.params.output.promptTime`,
-									{ kind: nextKind, mode: 'prepend', source: 'template_output' },
-									{ shouldDirty: true },
-								);
-							}
-							if (nextKind === 'append_after_last_user') {
-								setValue(
-									`operations.${index}.config.params.output.promptTime`,
-									{ kind: nextKind, role: 'system', source: 'template_output' },
-									{ shouldDirty: true },
-								);
-							}
-							if (nextKind === 'insert_at_depth') {
-								setValue(
-									`operations.${index}.config.params.output.promptTime`,
-									{ kind: nextKind, depthFromEnd: 0, role: 'system', source: 'template_output' },
-									{ shouldDirty: true },
-								);
-							}
-						}}
-						comboboxProps={{ withinPortal: false }}
-					/>
+			<Stack gap="xs">
+				<Group justify="space-between" align="center">
+					<Text fw={600}>{t('operationProfiles.sectionsLabels.exposures')}</Text>
+					<Group gap="xs">
+						{exposureTypeOptions.map((option) => (
+							<Button
+								key={option.value}
+								size="xs"
+								variant="light"
+								onClick={() => exposuresArray.append(makeDefaultExposure(option.value as ArtifactExposure['type']))}
+							>
+								{t(option.label)}
+							</Button>
+						))}
+					</Group>
+				</Group>
 
-					{promptKind === 'system_update' && (
-						<Group grow wrap="wrap">
-							<FormSelect
-								name={`operations.${index}.config.params.output.promptTime.mode`}
-								label={t('operationProfiles.sectionsLabels.mode')}
-								infoTip={t('operationProfiles.tooltips.mode')}
-								selectProps={{ options: systemUpdateModeOptions, comboboxProps: { withinPortal: false } }}
-							/>
-							<FormInput
-								name={`operations.${index}.config.params.output.promptTime.source`}
-								label={t('operationProfiles.sectionsLabels.sourceOptional')}
-								infoTip={t('operationProfiles.tooltips.sourceOptional')}
-							/>
-						</Group>
-					)}
+				{exposuresArray.fields.length === 0 && (
+					<Text size="sm" c="dimmed">
+						{t('operationProfiles.outputNotes.noExposures')}
+					</Text>
+				)}
 
-					{(promptKind === 'append_after_last_user' || promptKind === 'insert_at_depth') && (
-						<Group grow wrap="wrap">
-							<FormSelect
-								name={`operations.${index}.config.params.output.promptTime.role`}
-								label={t('operationProfiles.sectionsLabels.role')}
-								infoTip={t('operationProfiles.tooltips.role')}
-								selectProps={{ options: promptTimeRoleOptions, comboboxProps: { withinPortal: false } }}
-							/>
-							<FormInput
-								name={`operations.${index}.config.params.output.promptTime.source`}
-								label={t('operationProfiles.sectionsLabels.sourceOptional')}
-								infoTip={t('operationProfiles.tooltips.sourceOptional')}
-							/>
-						</Group>
-					)}
+				{exposuresArray.fields.map((field, exposureIndex) => {
+					const exposure = (artifact?.exposures?.[exposureIndex] ?? field) as ArtifactExposure;
+					return (
+						<Paper key={field.id} withBorder p="sm">
+							<Stack gap="xs">
+								<Group justify="space-between" align="center">
+									<Text fw={600}>{getExposureCardTitle(t, exposure)}</Text>
+									<Button size="xs" color="red" variant="subtle" onClick={() => exposuresArray.remove(exposureIndex)}>
+										{t('common.delete')}
+									</Button>
+								</Group>
+								<Controller
+									control={control}
+									name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.type`}
+									render={({ field: typeField }) => (
+										<Select
+											label={t('operationProfiles.sectionsLabels.exposureType')}
+											data={exposureTypeOptions.map((option) => ({
+												value: option.value,
+												label: t(option.label),
+											}))}
+											value={typeof typeField.value === 'string' ? typeField.value : exposure.type}
+											onChange={(next) => {
+												if (!next) return;
+												setValue(
+													`operations.${index}.config.params.artifact.exposures.${exposureIndex}`,
+													makeDefaultExposure(next as ArtifactExposure['type']),
+													{ shouldDirty: true },
+												);
+											}}
+											comboboxProps={{ withinPortal: false }}
+										/>
+									)}
+								/>
 
-					{promptKind === 'insert_at_depth' && (
-						<FormNumberInput
-							name={`operations.${index}.config.params.output.promptTime.depthFromEnd`}
-							label={t('operationProfiles.sectionsLabels.depthFromEnd')}
-							infoTip={t('operationProfiles.tooltips.depthFromEnd')}
-							numberInputProps={{ min: 0, step: 1 }}
-						/>
-					)}
+								{exposure.type === 'prompt_part' && (
+									<Group grow wrap="wrap">
+										<FormSelect
+											name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.mode`}
+											label={t('operationProfiles.sectionsLabels.mode')}
+											selectProps={{
+												options: promptPartModeOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })),
+												comboboxProps: { withinPortal: false },
+											}}
+										/>
+									</Group>
+								)}
 
-					<Text size="xs" c="dimmed">
-						{t('operationProfiles.outputNotes.promptTimePayloadSource')}
-					</Text>
-				</Stack>
-			)}
+								{(exposure.type === 'prompt_message' || exposure.type === 'ui_inline') && (
+									<>
+										<Group grow wrap="wrap">
+											<FormSelect
+												name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.role`}
+												label={t('operationProfiles.sectionsLabels.role')}
+												selectProps={{ options: roleOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })), comboboxProps: { withinPortal: false } }}
+											/>
+											<FormSelect
+												name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.anchor`}
+												label={t('operationProfiles.sectionsLabels.anchor')}
+												selectProps={{ options: translatedAnchorOptions, comboboxProps: { withinPortal: false } }}
+											/>
+										</Group>
+										<Group grow wrap="wrap">
+										<FormInput
+											name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.source`}
+											label={t('operationProfiles.sectionsLabels.sourceOptional')}
+										/>
+											{exposure.anchor === 'depth_from_end' && (
+												<FormNumberInput
+													name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.depthFromEnd`}
+													label={t('operationProfiles.sectionsLabels.depthFromEnd')}
+													numberInputProps={{ min: 0, step: 1 }}
+												/>
+											)}
+										</Group>
+									</>
+								)}
 
-			{normalizedType === 'turn_canonicalization' && (
-				<Stack gap="xs">
-					<FormSelect
-						name={`operations.${index}.config.params.output.canonicalization.target`}
-						label={t('operationProfiles.sectionsLabels.target')}
-						infoTip={t('operationProfiles.tooltips.target')}
-						selectProps={{
-							options: [
-								{ value: 'user', label: 'user' },
-								{ value: 'assistant', label: 'assistant' },
-							],
-							comboboxProps: { withinPortal: false },
-						}}
-					/>
-					<Text size="xs" c="dimmed">
-						{t('operationProfiles.outputNotes.turnCanonicalization')}
-					</Text>
-				</Stack>
-			)}
+								{exposure.type === 'turn_rewrite' && (
+									<Group grow wrap="wrap">
+										<FormSelect
+											name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.target`}
+											label={t('operationProfiles.sectionsLabels.target')}
+											selectProps={{ options: translatedTargetOptions, comboboxProps: { withinPortal: false } }}
+										/>
+										<FormSelect
+											name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.mode`}
+											label={t('operationProfiles.sectionsLabels.mode')}
+											selectProps={{
+												options: [{ value: 'replace', label: t('operationProfiles.valueLabel.replace') }],
+												disabled: true,
+												comboboxProps: { withinPortal: false },
+											}}
+										/>
+									</Group>
+								)}
+							</Stack>
+						</Paper>
+					);
+				})}
+			</Stack>
 		</Stack>
 	);
 };
 
+
diff --git a/web/src/i18n/resources/en/operationProfiles.ts b/web/src/i18n/resources/en/operationProfiles.ts
index 4f1df8f9..5c51da26 100644
--- a/web/src/i18n/resources/en/operationProfiles.ts
+++ b/web/src/i18n/resources/en/operationProfiles.ts
@@ -1,4 +1,4 @@
-const enOperationProfiles = {
+const enOperationProfiles = {
 			sidebar: {
 				title: 'Operations',
 			},
@@ -103,15 +103,22 @@
 				dependsOn: 'Depends on',
 				activationEveryNTurns: 'Every N turns',
 				activationEveryNContextTokens: 'Every N context tokens',
-				effectType: 'Effect type',
-				artifactTag: 'Artifact tag',
+				artifactId: 'Artifact id',
+				tag: 'Artifact tag',
+				artifactTitle: 'Artifact title',
+				artifactDescription: 'Artifact description',
+				format: 'Format',
 				persistence: 'Persistence',
-				usage: 'Usage',
+				writeMode: 'Write mode',
+				historyEnabled: 'Store history',
+				historyMaxItems: 'History limit',
 				semantics: 'Semantics',
-				promptTimeEffect: 'Prompt-time effect',
+				exposures: 'Exposures',
+				exposureType: 'Exposure type',
 				mode: 'Mode',
 				sourceOptional: 'Source (optional)',
 				role: 'Role',
+				anchor: 'Anchor',
 				depthFromEnd: 'atDepth',
 				target: 'Target',
 			},
@@ -127,15 +134,17 @@
 					'0 disables this mechanism. If N is set, the operation becomes eligible on every Nth user send event (regenerate/continue/system are ignored).',
 				activationEveryNContextTokens:
 					'0 disables this mechanism. Counts accumulated context tokens for user/assistant messages only (system excluded), estimated as chars/4.',
-				effectType: 'Choose how rendered result is applied during commit at runtime.',
-				artifactTag: 'Use a tag without `art` prefix. Each tag in profile should have a single writer.',
+				artifactTitle: 'Human-readable name for the primary artifact shown in the editor and debug output.',
+				artifactDescription: 'Optional note describing the purpose of the artifact.',
+				format: 'Artifact payload format. For LLM JSON output, `json` is usually the right choice.',
 				persistence: '`persisted` survives turns; `run_only` exists only during current run.',
-				usage: 'Choose whether artifact is used in prompt, UI, both, or internal only.',
+				writeMode: '`replace` overwrites current value; `append` writes a new snapshot and makes it the current value.',
+				historyMaxItems: 'How many latest snapshots to keep for context and debugging.',
 				semantics: 'Semantic label for consumers, e.g. "state" or "log/feed".',
-				promptTimeEffect: 'Effect kind for prompt-time text insertion.',
 				mode: '`prepend` => payload + system; `append` => system + payload; `replace` => system = payload.',
 				sourceOptional: 'Optional source label for debugging/explainability.',
 				role: 'Role for synthetic prompt message.',
+				anchor: 'Where to attach the exposure relative to the current conversation.',
 				depthFromEnd:
 					'0 inserts at the end; N inserts N messages from the end. Large values clamp right after the main system instruction.',
 				target: '`before_main_llm` allows only target=user; `after_main_llm` allows user or assistant.',
@@ -144,19 +153,38 @@
 				activationRule:
 					'Conditions are combined with OR: reaching either threshold is enough. When one triggers, both counters are reset for this operation.',
 			},
-			outputType: {
-				artifacts: 'Artifacts',
-				promptTime: 'Prompt-time effects',
-				turnCanonicalization: 'Turn canonicalization effects',
-			},
 			outputNotes: {
-				promptTimePayloadSource: 'Effect payload source is template-rendered text.',
-				turnCanonicalization: 'Current `replace_text` mode: selected turn part is overwritten with template output.',
+				artifactModel:
+					'Each operation writes to one primary artifact. Exposures define how that value is additionally materialized into prompt state, turn rewrites, or UI.',
+				referenceByTag: 'In templates, reference another artifact as {{art.story_summary.value}}.',
+				noExposures: 'This artifact has no exposures yet. It will be available only as artifact state.',
+			},
+			exposureType: {
+				promptPart: 'Prompt part',
+				promptMessage: 'Prompt message',
+				turnRewrite: 'Turn rewrite',
+				uiInline: 'UI inline',
+			},
+			anchor: {
+				afterLastUser: 'After last user',
+				depthFromEnd: 'Depth from end',
 			},
-			promptTimeKind: {
-				appendAfterLastUser: 'prompt.append_after_last_user',
-				systemUpdate: 'prompt.system_update',
-				insertAtDepth: 'prompt.insert_at_depth',
+			rewriteTarget: {
+				currentUserMain: 'Current user main',
+				assistantOutputMain: 'Assistant output main',
+			},
+			valueLabel: {
+				text: 'Text',
+				markdown: 'Markdown',
+				json: 'JSON',
+				persisted: 'Persisted',
+				run_only: 'Run only',
+				replace: 'Replace',
+				append: 'Append',
+				prepend: 'Prepend',
+				system: 'System',
+				user: 'User',
+				assistant: 'Assistant',
 			},
 			kind: {
 				template: 'Template',
@@ -317,3 +345,4 @@
 
 export default enOperationProfiles;
 
+
diff --git a/web/src/i18n/resources/ru/operationProfiles.ts b/web/src/i18n/resources/ru/operationProfiles.ts
index 01b69409..553b67df 100644
--- a/web/src/i18n/resources/ru/operationProfiles.ts
+++ b/web/src/i18n/resources/ru/operationProfiles.ts
@@ -1,4 +1,4 @@
-const ruOperationProfiles = {
+const ruOperationProfiles = {
 			sidebar: {
 				title: 'Операции',
 			},
@@ -97,22 +97,29 @@
 				description: 'Описание',
 				enabled: 'Включено',
 				required: 'Обязательная',
-				hook: 'Hook',
+				hook: 'Хук',
 				triggers: 'Триггеры',
 				order: 'Порядок',
 				dependsOn: 'Зависит от',
 				activationEveryNTurns: 'Каждые N ходов',
 				activationEveryNContextTokens: 'Каждые N токенов контекста',
-				effectType: 'Тип эффекта',
-				artifactTag: 'Тег артефакта',
-				persistence: 'Persistence',
-				usage: 'Usage',
-				semantics: 'Semantics',
-				promptTimeEffect: 'Эффект prompt-time',
+				artifactId: 'Идентификатор артефакта',
+				tag: 'Тег артефакта',
+				artifactTitle: 'Заголовок артефакта',
+				artifactDescription: 'Описание артефакта',
+				format: 'Формат',
+				persistence: 'Хранение',
+				writeMode: 'Режим записи',
+				historyEnabled: 'Хранить историю',
+				historyMaxItems: 'Лимит истории',
+				semantics: 'Семантика',
+				exposures: 'Экспозиции',
+				exposureType: 'Тип экспозиции',
 				mode: 'Режим',
 				sourceOptional: 'Источник (опционально)',
 				role: 'Роль',
-				depthFromEnd: 'atDepth',
+				anchor: 'Якорь',
+				depthFromEnd: 'Глубина от конца',
 				target: 'Цель',
 			},
 			tooltips: {
@@ -127,15 +134,18 @@
 					'0 — выключено. Если задано N, операция станет доступна на каждом N-м событии user send (регенерация/continue/system не учитываются).',
 				activationEveryNContextTokens:
 					'0 — выключено. Считается накопление токенов только по user/assistant сообщениям контекста (без system), оценка chars/4.',
-				effectType: 'Выберите, как применить отрендеренный результат при commit во время выполнения.',
-				artifactTag: 'Используйте тег без префикса art. У каждого тега в профиле должен быть один writer.',
+				artifactTitle: 'Человекочитаемое имя primary artifact, которое будет видно в редакторе и отладке.',
+				artifactDescription: 'Необязательное пояснение назначения артефакта.',
+				tag: 'Человекочитаемый тег для ссылок на артефакт из других шаблонов через art.<tag>.',
+				format: 'Формат значения артефакта. Для LLM json-выхода обычно нужен json.',
 				persistence: 'persisted переживает ходы; run_only существует только в текущем запуске.',
-				usage: 'Выберите, используется ли артефакт в prompt, UI, обоих, или только внутренне.',
+				writeMode: 'replace переписывает current value; append добавляет новый snapshot в историю и делает его current.',
+				historyMaxItems: 'Сколько последних snapshot-значений хранить для контекста и отладки.',
 				semantics: 'Семантическая метка для потребителей, например "state" или "log/feed".',
-				promptTimeEffect: 'Тип эффекта для prompt-time вставки текста.',
 				mode: 'prepend => payload + system; append => system + payload; replace => system = payload.',
 				sourceOptional: 'Необязательная метка источника для отладки/объяснимости.',
 				role: 'Роль для синтетического prompt-сообщения.',
+				anchor: 'Куда прикреплять exposure относительно текущего диалога.',
 				depthFromEnd:
 					'0 — вставить в конец; N — вставить на глубине N от конца. Большие значения ограничиваются позицией сразу после основной system-инструкции.',
 				target: 'before_main_llm допускает только target=user; after_main_llm допускает user или assistant.',
@@ -144,27 +154,46 @@
 				activationRule:
 					'Условия объединяются по OR: достаточно одного порога. При срабатывании одного — оба счетчика этой операции сбрасываются.',
 			},
-			outputType: {
-				artifacts: 'Artifacts',
-				promptTime: 'Prompt-time effects',
-				turnCanonicalization: 'Turn canonicalization effects',
-			},
 			outputNotes: {
-				promptTimePayloadSource: 'Источник payload эффекта — текст, отрендеренный шаблоном.',
-				turnCanonicalization: 'Текущий режим replace_text: выбранная часть хода перезаписывается template output.',
+				artifactModel:
+					'Операция всегда пишет в один primary artifact. Exposures определяют, как это значение дополнительно материализуется в prompt, turn rewrite или UI.',
+				referenceByTag: 'В шаблонах можно ссылаться на другой артефакт как {{art.story_summary.value}}.',
+				noExposures: 'У этого артефакта пока нет экспозиций. Он будет доступен только как состояние артефакта.',
+			},
+			exposureType: {
+				promptPart: 'Часть промпта',
+				promptMessage: 'Сообщение промпта',
+				turnRewrite: 'Перезапись хода',
+				uiInline: 'Встроенный UI',
+			},
+			anchor: {
+				afterLastUser: 'После последнего user',
+				depthFromEnd: 'На глубине от конца',
 			},
-			promptTimeKind: {
-				appendAfterLastUser: 'prompt.append_after_last_user',
-				systemUpdate: 'prompt.system_update',
-				insertAtDepth: 'prompt.insert_at_depth',
+			rewriteTarget: {
+				currentUserMain: 'Текущий user main',
+				assistantOutputMain: 'Основной ответ assistant',
+			},
+			valueLabel: {
+				text: 'Текст',
+				markdown: 'Markdown',
+				json: 'JSON',
+				persisted: 'Сохранять',
+				run_only: 'Только на запуск',
+				replace: 'Заменить',
+				append: 'Добавить',
+				prepend: 'В начало',
+				system: 'Система',
+				user: 'Пользователь',
+				assistant: 'Ассистент',
 			},
 			kind: {
-				template: 'Template',
+				template: 'Шаблон',
 				llm: 'LLM',
 				rag: 'RAG',
-				tool: 'Tool',
-				compute: 'Compute',
-				transform: 'Transform',
+				tool: 'Инструмент',
+				compute: 'Вычисление',
+				transform: 'Преобразование',
 				legacy: 'Legacy',
 			},
 			kindSection: {
@@ -317,3 +346,4 @@
 
 export default ruOperationProfiles;
 
+

From caa0e90c0e03034e257a0d6a25d130f14d194b40 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Wed, 11 Mar 2026 00:07:50 +0300
Subject: [PATCH 08/54] =?UTF-8?q?Update=20instructions=20to=20basic=20and?=
 =?UTF-8?q?=20st=C3=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .codex/environments/environment.toml          |   6 +
 server/drizzle/0029_instruction_kinds.sql     |  28 +
 server/drizzle/meta/_journal.json             |   7 +
 server/src/api/instructions.core.api.ts       |  76 +-
 .../chat-core/schemas.instructions.test.ts    |  83 ++
 server/src/chat-core/schemas.ts               |  93 +-
 server/src/db/ensure-instructions-schema.ts   |  46 +
 server/src/db/schema/instructions.ts          |   2 +
 ...on-st-preset.ts => instruction-st-base.ts} |  93 +-
 .../chat-core/instruction-st-preset.test.ts   |  20 +-
 .../chat-core/instructions-repository.test.ts | 122 +++
 .../chat-core/instructions-repository.ts      | 100 +-
 .../chat-core/prompt-template-renderer.ts     |   8 +-
 .../chat-entry-parts/parts-repository.ts      |   2 +-
 .../profile-session-artifact-store.ts         |  50 +-
 .../artifacts/run-artifact-store.test.ts      |  42 +-
 .../artifacts/run-artifact-store.ts           |  40 +-
 .../chat-generation-v3/contracts.test.ts      | 116 ++-
 .../services/chat-generation-v3/contracts.ts  | 160 +++-
 .../operations/commit-effects-phase.test.ts   |  30 +-
 .../operations/commit-effects-phase.ts        |  30 +-
 .../effect-handlers/artifact-effects.test.ts  |  30 +-
 .../effect-handlers/artifact-effects.ts       |  23 +-
 .../effect-handlers/ui-effects.test.ts        | 222 +++++
 .../operations/effect-handlers/ui-effects.ts  | 142 +++
 .../operations/effect-policy.test.ts          |  12 +-
 .../execute-operations-phase.test.ts          |  79 +-
 .../operations/execute-operations-phase.ts    | 174 ++--
 .../operations-flow.integration.test.ts       |  48 +-
 .../orchestration/run-operation-hook-phase.ts |   5 +-
 .../orchestration/run-state-helpers.ts        |   8 +-
 .../prompt/build-base-prompt.test.ts          | 105 ++-
 .../prompt/build-base-prompt.ts               |  54 +-
 .../run-chat-generation-v3.ts                 |   2 +
 .../runtime/operation-runtime-state.test.ts   |  27 +-
 .../operation-block-validator.test.ts         |  88 ++
 .../operations/operation-block-validator.ts   | 402 +++++---
 .../operations/operation-blocks-repository.ts |  11 +-
 .../operation-profile-resolver.test.ts        |  67 +-
 .../operations/operation-profile-resolver.ts  |   4 +
 .../template-operations-runtime.test.ts       | 100 +-
 .../operations/template-operations-runtime.ts | 167 ++--
 shared/types/instructions.ts                  |  49 +-
 shared/types/operation-profiles.ts            | 456 ++++++++-
 web/src/api/instructions.ts                   |  77 +-
 .../features/sidebars/instructions/index.tsx  | 279 ++++--
 .../instructions/instruction-editor.tsx       | 862 +++++++++---------
 .../form/operation-profile-form-mapping.ts    | 291 +++---
 .../ui/operation-editor/operation-editor.tsx  |  35 +-
 .../sections/output-section.tsx               | 450 ++++-----
 web/src/i18n/resources/en/instructions.ts     |  12 +-
 .../i18n/resources/en/operationProfiles.ts    |  69 +-
 web/src/i18n/resources/ru/instructions.ts     |  12 +-
 .../i18n/resources/ru/operationProfiles.ts    |  86 +-
 web/src/model/instructions/index.ts           | 128 +--
 web/src/model/instructions/st-preset.ts       | 131 ++-
 56 files changed, 3906 insertions(+), 1955 deletions(-)
 create mode 100644 .codex/environments/environment.toml
 create mode 100644 server/drizzle/0029_instruction_kinds.sql
 create mode 100644 server/src/chat-core/schemas.instructions.test.ts
 rename server/src/services/chat-core/{instruction-st-preset.ts => instruction-st-base.ts} (83%)
 create mode 100644 server/src/services/chat-core/instructions-repository.test.ts
 create mode 100644 server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.test.ts
 create mode 100644 server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.ts

diff --git a/.codex/environments/environment.toml b/.codex/environments/environment.toml
new file mode 100644
index 00000000..8b52c31b
--- /dev/null
+++ b/.codex/environments/environment.toml
@@ -0,0 +1,6 @@
+# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY
+version = 1
+name = "TaleSpinner_v1"
+
+[setup]
+script = "yarn install:all"
diff --git a/server/drizzle/0029_instruction_kinds.sql b/server/drizzle/0029_instruction_kinds.sql
new file mode 100644
index 00000000..ad2fc772
--- /dev/null
+++ b/server/drizzle/0029_instruction_kinds.sql
@@ -0,0 +1,28 @@
+ALTER TABLE `instructions` ADD COLUMN `kind` text DEFAULT 'basic' NOT NULL;
+--> statement-breakpoint
+
+ALTER TABLE `instructions` ADD COLUMN `st_base_json` text;
+--> statement-breakpoint
+
+UPDATE `instructions`
+SET `kind` = CASE
+  WHEN json_valid(`meta_json`) AND json_extract(`meta_json`, '$.tsInstruction.mode') = 'st_advanced' THEN 'st_base'
+  WHEN `kind` IS NULL OR trim(`kind`) = '' THEN 'basic'
+  ELSE `kind`
+END;
+--> statement-breakpoint
+
+UPDATE `instructions`
+SET `st_base_json` = CASE
+  WHEN `st_base_json` IS NOT NULL THEN `st_base_json`
+  WHEN json_valid(`meta_json`) AND json_type(`meta_json`, '$.stBase') IS NOT NULL THEN json_extract(`meta_json`, '$.stBase')
+  WHEN json_valid(`meta_json`) AND json_type(`meta_json`, '$.tsInstruction.stAdvanced') IS NOT NULL THEN json_extract(`meta_json`, '$.tsInstruction.stAdvanced')
+  ELSE `st_base_json`
+END;
+--> statement-breakpoint
+
+UPDATE `instructions`
+SET `meta_json` = CASE
+  WHEN json_valid(`meta_json`) AND json_type(`meta_json`, '$.tsInstruction') IS NOT NULL THEN json_remove(`meta_json`, '$.tsInstruction')
+  ELSE `meta_json`
+END;
diff --git a/server/drizzle/meta/_journal.json b/server/drizzle/meta/_journal.json
index 050f76c6..7947e0bb 100644
--- a/server/drizzle/meta/_journal.json
+++ b/server/drizzle/meta/_journal.json
@@ -176,6 +176,13 @@
       "when": 1773012000000,
       "tag": "0028_ui_app_settings_bind_chat_completion",
       "breakpoints": true
+    },
+    {
+      "idx": 25,
+      "version": "7",
+      "when": 1773100000000,
+      "tag": "0029_instruction_kinds",
+      "breakpoints": true
     }
   ]
 }
diff --git a/server/src/api/instructions.core.api.ts b/server/src/api/instructions.core.api.ts
index 43fe4f0f..85815ccc 100644
--- a/server/src/api/instructions.core.api.ts
+++ b/server/src/api/instructions.core.api.ts
@@ -97,23 +97,39 @@ router.post(
   "/instructions",
   validate({ body: createInstructionBodySchema }),
   asyncHandler(async (req: Request) => {
-    try {
-      validateLiquidTemplate(req.body.templateText);
-    } catch (error) {
-      throw new HttpError(
-        400,
-        `Instruction не компилируется: ${error instanceof Error ? error.message : String(error)}`,
-        "VALIDATION_ERROR"
-      );
+    const body = createInstructionBodySchema.parse(req.body);
+
+    if (body.kind === "basic") {
+      try {
+        validateLiquidTemplate(body.templateText);
+      } catch (error) {
+        throw new HttpError(
+          400,
+          `Instruction не компилируется: ${error instanceof Error ? error.message : String(error)}`,
+          "VALIDATION_ERROR"
+        );
+      }
     }
 
-    const created = await createInstruction({
-      ownerId: getRequestOwnerId(req, req.body.ownerId),
-      name: req.body.name,
-      engine: req.body.engine,
-      templateText: req.body.templateText,
-      meta: req.body.meta,
-    });
+    const ownerId = getRequestOwnerId(req, body.ownerId);
+    const created =
+      body.kind === "basic"
+        ? await createInstruction({
+            ownerId,
+            name: body.name,
+            kind: "basic",
+            engine: body.engine,
+            templateText: body.templateText,
+            meta: body.meta,
+          })
+        : await createInstruction({
+            ownerId,
+            name: body.name,
+            kind: "st_base",
+            engine: body.engine,
+            stBase: body.stBase,
+            meta: body.meta,
+          });
     return { data: created };
   })
 );
@@ -123,9 +139,10 @@ router.put(
   validate({ params: idParamsSchema, body: updateInstructionBodySchema }),
   asyncHandler(async (req: Request) => {
     const params = req.params as unknown as { id: string };
-    if (typeof req.body.templateText === "string") {
+    const body = updateInstructionBodySchema.parse(req.body);
+    if (body.kind === "basic" && typeof body.templateText === "string") {
       try {
-        validateLiquidTemplate(req.body.templateText);
+        validateLiquidTemplate(body.templateText);
       } catch (error) {
         throw new HttpError(
           400,
@@ -135,13 +152,24 @@ router.put(
       }
     }
 
-    const updated = await updateInstruction({
-      id: params.id,
-      name: req.body.name,
-      engine: req.body.engine,
-      templateText: req.body.templateText,
-      meta: typeof req.body.meta === "undefined" ? undefined : req.body.meta,
-    });
+    let updated;
+    try {
+      updated = await updateInstruction({
+        id: params.id,
+        kind: body.kind,
+        name: body.name,
+        engine: body.engine,
+        templateText: body.kind === "basic" ? body.templateText : undefined,
+        stBase: body.kind === "st_base" ? body.stBase : undefined,
+        meta: typeof body.meta === "undefined" ? undefined : body.meta,
+      });
+    } catch (error) {
+      throw new HttpError(
+        400,
+        error instanceof Error ? error.message : String(error),
+        "VALIDATION_ERROR"
+      );
+    }
     if (!updated)
       throw new HttpError(404, "Instruction не найден", "NOT_FOUND");
     return { data: updated };
diff --git a/server/src/chat-core/schemas.instructions.test.ts b/server/src/chat-core/schemas.instructions.test.ts
new file mode 100644
index 00000000..a34a1544
--- /dev/null
+++ b/server/src/chat-core/schemas.instructions.test.ts
@@ -0,0 +1,83 @@
+import { describe, expect, test } from "vitest";
+
+import {
+  createInstructionBodySchema,
+  updateInstructionBodySchema,
+} from "./schemas";
+
+describe("instruction schemas", () => {
+  test("accepts basic instruction payload", () => {
+    const parsed = createInstructionBodySchema.safeParse({
+      name: "Basic",
+      kind: "basic",
+      templateText: "{{char.name}}",
+    });
+
+    expect(parsed.success).toBe(true);
+  });
+
+  test("accepts st_base instruction payload", () => {
+    const parsed = createInstructionBodySchema.safeParse({
+      name: "ST",
+      kind: "st_base",
+      stBase: {
+        rawPreset: {},
+        prompts: [{ identifier: "main", content: "Hello" }],
+        promptOrder: [
+          {
+            character_id: 100001,
+            order: [{ identifier: "main", enabled: true }],
+          },
+        ],
+        responseConfig: {},
+        importInfo: {
+          source: "sillytavern",
+          fileName: "Default.json",
+          importedAt: "2026-03-10T00:00:00.000Z",
+        },
+      },
+    });
+
+    expect(parsed.success).toBe(true);
+  });
+
+  test("rejects mixed create payload", () => {
+    const parsed = createInstructionBodySchema.safeParse({
+      name: "Bad",
+      kind: "st_base",
+      templateText: "{{char.name}}",
+      stBase: {
+        rawPreset: {},
+        prompts: [],
+        promptOrder: [],
+        responseConfig: {},
+        importInfo: {
+          source: "sillytavern",
+          fileName: "Default.json",
+          importedAt: "2026-03-10T00:00:00.000Z",
+        },
+      },
+    });
+
+    expect(parsed.success).toBe(false);
+  });
+
+  test("rejects update payload that omits stBase for st_base-only fields", () => {
+    const parsed = updateInstructionBodySchema.safeParse({
+      kind: "basic",
+      stBase: {
+        rawPreset: {},
+        prompts: [],
+        promptOrder: [],
+        responseConfig: {},
+        importInfo: {
+          source: "sillytavern",
+          fileName: "Default.json",
+          importedAt: "2026-03-10T00:00:00.000Z",
+        },
+      },
+    });
+
+    expect(parsed.success).toBe(false);
+  });
+});
diff --git a/server/src/chat-core/schemas.ts b/server/src/chat-core/schemas.ts
index acce3557..2a6c0e5b 100644
--- a/server/src/chat-core/schemas.ts
+++ b/server/src/chat-core/schemas.ts
@@ -7,6 +7,7 @@ export const idSchema = z.string().min(1);
 export const ownerIdSchema = z.string().min(1).default("global");
 
 export const jsonValueSchema: z.ZodType<unknown> = z.unknown();
+export const jsonRecordSchema = z.record(z.string(), z.unknown());
 
 export const messageRoleSchema = z.enum(["user", "assistant", "system"]);
 
@@ -108,20 +109,100 @@ export const listInstructionsQuerySchema = z.object({
   ownerId: ownerIdSchema.optional(),
 });
 
-export const createInstructionBodySchema = z.object({
+const stBasePromptRoleSchema = z.enum(["system", "user", "assistant"]);
+
+const stBasePromptSchema = z.object({
+  identifier: z.string().min(1),
+  name: z.string().min(1).optional(),
+  role: stBasePromptRoleSchema.optional(),
+  content: z.string().optional(),
+  system_prompt: z.boolean().optional(),
+  marker: z.boolean().optional(),
+}).strict();
+
+const stBasePromptOrderEntrySchema = z.object({
+  identifier: z.string().min(1),
+  enabled: z.boolean(),
+}).strict();
+
+const stBasePromptOrderSchema = z.object({
+  character_id: z.number().int(),
+  order: z.array(stBasePromptOrderEntrySchema),
+}).strict();
+
+const stBaseResponseConfigSchema = z.object({
+  temperature: z.number().optional(),
+  top_p: z.number().optional(),
+  top_k: z.number().optional(),
+  top_a: z.number().optional(),
+  min_p: z.number().optional(),
+  repetition_penalty: z.number().optional(),
+  frequency_penalty: z.number().optional(),
+  presence_penalty: z.number().optional(),
+  openai_max_tokens: z.number().int().positive().optional(),
+  seed: z.number().optional(),
+  n: z.number().int().positive().optional(),
+  reasoning_effort: z.string().min(1).optional(),
+  verbosity: z.string().min(1).optional(),
+  enable_web_search: z.boolean().optional(),
+  stream_openai: z.boolean().optional(),
+}).strict();
+
+export const stBaseConfigSchema = z.object({
+  rawPreset: jsonRecordSchema,
+  prompts: z.array(stBasePromptSchema),
+  promptOrder: z.array(stBasePromptOrderSchema),
+  responseConfig: stBaseResponseConfigSchema,
+  importInfo: z.object({
+    source: z.literal("sillytavern"),
+    fileName: z.string().min(1),
+    importedAt: z.string().min(1),
+  }).strict(),
+}).strict();
+
+const createBasicInstructionBodySchema = z.object({
   ownerId: ownerIdSchema.optional(),
   name: z.string().min(1),
+  kind: z.literal("basic"),
   engine: z.literal("liquidjs").optional().default("liquidjs"),
   templateText: z.string().min(1),
-  meta: jsonValueSchema.optional(),
-});
+  meta: jsonRecordSchema.optional(),
+}).strict();
+
+const createStBaseInstructionBodySchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  name: z.string().min(1),
+  kind: z.literal("st_base"),
+  engine: z.literal("liquidjs").optional().default("liquidjs"),
+  stBase: stBaseConfigSchema,
+  meta: jsonRecordSchema.optional(),
+}).strict();
 
-export const updateInstructionBodySchema = z.object({
+export const createInstructionBodySchema = z.discriminatedUnion("kind", [
+  createBasicInstructionBodySchema,
+  createStBaseInstructionBodySchema,
+]);
+
+const updateBasicInstructionBodySchema = z.object({
+  kind: z.literal("basic"),
   name: z.string().min(1).optional(),
   engine: z.literal("liquidjs").optional(),
   templateText: z.string().min(1).optional(),
-  meta: jsonValueSchema.optional(),
-});
+  meta: jsonRecordSchema.optional(),
+}).strict();
+
+const updateStBaseInstructionBodySchema = z.object({
+  kind: z.literal("st_base"),
+  name: z.string().min(1).optional(),
+  engine: z.literal("liquidjs").optional(),
+  stBase: stBaseConfigSchema.optional(),
+  meta: jsonRecordSchema.optional(),
+}).strict();
+
+export const updateInstructionBodySchema = z.discriminatedUnion("kind", [
+  updateBasicInstructionBodySchema,
+  updateStBaseInstructionBodySchema,
+]);
 
 // ---- Variants (minimal for v1 endpoints later)
 
diff --git a/server/src/db/ensure-instructions-schema.ts b/server/src/db/ensure-instructions-schema.ts
index ac7d68a5..0f69fe23 100644
--- a/server/src/db/ensure-instructions-schema.ts
+++ b/server/src/db/ensure-instructions-schema.ts
@@ -61,8 +61,10 @@ export async function ensureInstructionsSchema(): Promise<void> {
           "`id` text PRIMARY KEY NOT NULL," +
           "`owner_id` text DEFAULT 'global' NOT NULL," +
           "`name` text NOT NULL," +
+          "`kind` text DEFAULT 'basic' NOT NULL," +
           "`engine` text DEFAULT 'liquidjs' NOT NULL," +
           "`template_text` text NOT NULL," +
+          "`st_base_json` text," +
           "`meta_json` text," +
           "`created_at` integer NOT NULL," +
           "`updated_at` integer NOT NULL" +
@@ -82,6 +84,50 @@ export async function ensureInstructionsSchema(): Promise<void> {
     await db.run(sql.raw("DROP INDEX IF EXISTS `prompt_templates_owner_updated_at_idx`;"));
   }
 
+  if (!(await columnExists("instructions", "kind"))) {
+    await db.run(
+      sql.raw(
+        "ALTER TABLE `instructions` ADD COLUMN `kind` text DEFAULT 'basic' NOT NULL;"
+      )
+    );
+  }
+
+  if (!(await columnExists("instructions", "st_base_json"))) {
+    await db.run(
+      sql.raw("ALTER TABLE `instructions` ADD COLUMN `st_base_json` text;")
+    );
+  }
+
+  await db.run(
+    sql.raw(
+      "UPDATE `instructions` " +
+        "SET `kind` = CASE " +
+        "WHEN json_valid(`meta_json`) AND json_extract(`meta_json`, '$.tsInstruction.mode') = 'st_advanced' THEN 'st_base' " +
+        "WHEN `kind` IS NULL OR trim(`kind`) = '' THEN 'basic' " +
+        "ELSE `kind` END;"
+    )
+  );
+
+  await db.run(
+    sql.raw(
+      "UPDATE `instructions` " +
+        "SET `st_base_json` = CASE " +
+        "WHEN `st_base_json` IS NOT NULL THEN `st_base_json` " +
+        "WHEN json_valid(`meta_json`) AND json_type(`meta_json`, '$.stBase') IS NOT NULL THEN json_extract(`meta_json`, '$.stBase') " +
+        "WHEN json_valid(`meta_json`) AND json_type(`meta_json`, '$.tsInstruction.stAdvanced') IS NOT NULL THEN json_extract(`meta_json`, '$.tsInstruction.stAdvanced') " +
+        "ELSE `st_base_json` END;"
+    )
+  );
+
+  await db.run(
+    sql.raw(
+      "UPDATE `instructions` " +
+        "SET `meta_json` = CASE " +
+        "WHEN json_valid(`meta_json`) AND json_type(`meta_json`, '$.tsInstruction') IS NOT NULL THEN json_remove(`meta_json`, '$.tsInstruction') " +
+        "ELSE `meta_json` END;"
+    )
+  );
+
   const hasInstructionId = await columnExists("chats", "instruction_id");
   const hasPromptTemplateId = await columnExists("chats", "prompt_template_id");
 
diff --git a/server/src/db/schema/instructions.ts b/server/src/db/schema/instructions.ts
index 886048b5..0b8b4d6c 100644
--- a/server/src/db/schema/instructions.ts
+++ b/server/src/db/schema/instructions.ts
@@ -7,8 +7,10 @@ export const instructions = sqliteTable(
     ownerId: text("owner_id").notNull().default("global"),
 
     name: text("name").notNull(),
+    kind: text("kind").notNull().default("basic"),
     engine: text("engine").notNull().default("liquidjs"),
     templateText: text("template_text").notNull(),
+    stBaseJson: text("st_base_json"),
     metaJson: text("meta_json"),
 
     createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
diff --git a/server/src/services/chat-core/instruction-st-preset.ts b/server/src/services/chat-core/instruction-st-base.ts
similarity index 83%
rename from server/src/services/chat-core/instruction-st-preset.ts
rename to server/src/services/chat-core/instruction-st-base.ts
index 1d908ba3..0b5832bd 100644
--- a/server/src/services/chat-core/instruction-st-preset.ts
+++ b/server/src/services/chat-core/instruction-st-base.ts
@@ -2,15 +2,12 @@ import { renderLiquidTemplate } from "./prompt-template-renderer";
 
 import type { InstructionRenderContext } from "./prompt-template-renderer";
 import type {
-  InstructionMeta,
-  StAdvancedConfig,
-  StAdvancedResponseConfig,
-  StPrompt,
-  StPromptOrder,
-  TsInstructionMetaV1,
+  StBaseConfig,
+  StBasePrompt,
+  StBasePromptOrder,
+  StBaseResponseConfig,
 } from "@shared/types/instructions";
 
-const DEFAULT_SYSTEM_PROMPT = "You are a helpful assistant.";
 const PROMPT_ORDER_PREFERRED_CHARACTER_ID = 100001;
 
 const ST_PRESET_DETECT_KEYS = new Set([
@@ -51,7 +48,7 @@ const ST_SUPPORTED_PROMPT_IDENTIFIERS = new Set([
 
 type SensitiveImportMode = "remove" | "keep";
 
-type ResolvedAdvancedInstruction = {
+type ResolvedStBaseInstruction = {
   systemPrompt: string;
   preHistorySystemMessages: string[];
   postHistorySystemMessages: string[];
@@ -93,19 +90,19 @@ function toOptionalBoolean(value: unknown): boolean | undefined {
 
 function normalizeStPromptRole(
   value: unknown
-): StPrompt["role"] | undefined {
+): StBasePrompt["role"] | undefined {
   if (value === "system" || value === "user" || value === "assistant") {
     return value;
   }
   return undefined;
 }
 
-function normalizePrompt(prompt: unknown): StPrompt | null {
+function normalizePrompt(prompt: unknown): StBasePrompt | null {
   if (!isRecord(prompt)) return null;
   const identifier = asString(prompt.identifier);
   if (!identifier) return null;
 
-  const item: StPrompt = { identifier };
+  const item: StBasePrompt = { identifier };
   const name = asString(prompt.name);
   if (name) item.name = name;
 
@@ -116,6 +113,9 @@ function normalizePrompt(prompt: unknown): StPrompt | null {
   if (typeof prompt.system_prompt === "boolean") {
     item.system_prompt = prompt.system_prompt;
   }
+  if (typeof prompt.marker === "boolean") {
+    item.marker = prompt.marker;
+  }
   return item;
 }
 
@@ -131,7 +131,7 @@ function normalizePromptOrderEntry(
   };
 }
 
-function normalizePromptOrderItem(value: unknown): StPromptOrder | null {
+function normalizePromptOrderItem(value: unknown): StBasePromptOrder | null {
   if (!isRecord(value)) return null;
   const rawCharacterId = value.character_id;
   const characterId =
@@ -170,22 +170,22 @@ export function stripSensitiveFieldsFromPreset(
   return cloned;
 }
 
-export function normalizeStPrompts(input: unknown): StPrompt[] {
+export function normalizeStPrompts(input: unknown): StBasePrompt[] {
   if (!Array.isArray(input)) return [];
-  return input.map(normalizePrompt).filter((item): item is StPrompt => Boolean(item));
+  return input.map(normalizePrompt).filter((item): item is StBasePrompt => Boolean(item));
 }
 
-export function normalizeStPromptOrder(input: unknown): StPromptOrder[] {
+export function normalizeStPromptOrder(input: unknown): StBasePromptOrder[] {
   if (!Array.isArray(input)) return [];
   return input
     .map(normalizePromptOrderItem)
-    .filter((item): item is StPromptOrder => Boolean(item));
+    .filter((item): item is StBasePromptOrder => Boolean(item));
 }
 
 function normalizeResponseConfig(
   preset: Record<string, unknown>
-): StAdvancedResponseConfig {
-  const responseConfig: StAdvancedResponseConfig = {};
+): StBaseResponseConfig {
+  const responseConfig: StBaseResponseConfig = {};
 
   const numericKeys: StResponseNumericKey[] = [
     "temperature",
@@ -227,7 +227,7 @@ function normalizeResponseConfig(
 }
 
 function resolvePreferredPromptOrderEntries(
-  promptOrder: StPromptOrder[]
+  promptOrder: StBasePromptOrder[]
 ): Array<{ identifier: string; enabled: boolean }> {
   if (promptOrder.length === 0) return [];
   const preferred =
@@ -280,7 +280,7 @@ function resolveDynamicPromptContent(params: {
 }
 
 function toGatewaySettingsFromResponseConfig(
-  config: StAdvancedResponseConfig
+  config: StBaseResponseConfig
 ): Record<string, unknown> {
   const settings: Record<string, unknown> = {};
 
@@ -317,40 +317,11 @@ function toGatewaySettingsFromResponseConfig(
   return settings;
 }
 
-function normalizeInstructionMeta(meta: unknown): InstructionMeta {
-  if (!isRecord(meta)) return {};
-  return { ...meta };
-}
-
-export function getTsInstructionMeta(meta: unknown): TsInstructionMetaV1 | null {
-  if (!isRecord(meta) || !isRecord(meta.tsInstruction)) return null;
-  const tsInstruction = meta.tsInstruction;
-  if (tsInstruction.version !== 1) return null;
-  if (
-    tsInstruction.mode !== "basic" &&
-    tsInstruction.mode !== "st_advanced"
-  ) {
-    return null;
-  }
-  return tsInstruction as TsInstructionMetaV1;
-}
-
-export function withTsInstructionMeta(params: {
-  meta: unknown;
-  tsInstruction: TsInstructionMetaV1;
-}): InstructionMeta {
-  const normalized = normalizeInstructionMeta(params.meta);
-  return {
-    ...normalized,
-    tsInstruction: params.tsInstruction,
-  };
-}
-
-export function createStAdvancedConfigFromPreset(params: {
+export function createStBaseConfigFromPreset(params: {
   preset: Record<string, unknown>;
   fileName: string;
   sensitiveImportMode: SensitiveImportMode;
-}): StAdvancedConfig {
+}): StBaseConfig {
   const rawPreset =
     params.sensitiveImportMode === "remove"
       ? stripSensitiveFieldsFromPreset(params.preset)
@@ -371,20 +342,20 @@ export function createStAdvancedConfigFromPreset(params: {
   };
 }
 
-export async function resolveStAdvancedInstructionRuntime(params: {
-  stAdvanced: StAdvancedConfig;
+export async function resolveStBaseInstructionRuntime(params: {
+  stBase: StBaseConfig;
   context: InstructionRenderContext;
-}): Promise<ResolvedAdvancedInstruction> {
+}): Promise<ResolvedStBaseInstruction> {
   const promptsByIdentifier = new Map(
-    params.stAdvanced.prompts.map((item) => [item.identifier, item] as const)
+    params.stBase.prompts.map((item) => [item.identifier, item] as const)
   );
   const selectedOrder = resolvePreferredPromptOrderEntries(
-    params.stAdvanced.promptOrder
+    params.stBase.promptOrder
   );
   const fallbackOrder =
     selectedOrder.length > 0
       ? selectedOrder
-      : params.stAdvanced.prompts.map((item) => ({
+      : params.stBase.prompts.map((item) => ({
           identifier: item.identifier,
           enabled: true,
         }));
@@ -426,7 +397,7 @@ export async function resolveStAdvancedInstructionRuntime(params: {
     usedPromptIdentifiers.push(identifier);
   }
 
-  let systemPrompt = DEFAULT_SYSTEM_PROMPT;
+  let systemPrompt: string | null = null;
   let preHistorySystemMessages: string[] = [];
   let postHistorySystemMessages = [...postHistory];
 
@@ -438,12 +409,16 @@ export async function resolveStAdvancedInstructionRuntime(params: {
     postHistorySystemMessages = postHistory.slice(1);
   }
 
+  if (!systemPrompt || !systemPrompt.trim()) {
+    throw new Error("st_base instruction did not resolve a system prompt");
+  }
+
   return {
     systemPrompt,
     preHistorySystemMessages,
     postHistorySystemMessages,
     derivedSettings: toGatewaySettingsFromResponseConfig(
-      params.stAdvanced.responseConfig
+      params.stBase.responseConfig
     ),
     usedPromptIdentifiers,
   };
diff --git a/server/src/services/chat-core/instruction-st-preset.test.ts b/server/src/services/chat-core/instruction-st-preset.test.ts
index fa657ff6..f62d53ad 100644
--- a/server/src/services/chat-core/instruction-st-preset.test.ts
+++ b/server/src/services/chat-core/instruction-st-preset.test.ts
@@ -1,13 +1,13 @@
 import { describe, expect, test } from "vitest";
 
 import {
-  createStAdvancedConfigFromPreset,
+  createStBaseConfigFromPreset,
   detectStChatCompletionPreset,
-  resolveStAdvancedInstructionRuntime,
+  resolveStBaseInstructionRuntime,
   stripSensitiveFieldsFromPreset,
-} from "./instruction-st-preset";
+} from "./instruction-st-base";
 
-describe("instruction-st-preset", () => {
+describe("instruction-st-base", () => {
   test("parses ST Default.json compatible preset shape", () => {
     const rawDefault = `{
       "chat_completion_source": "openai",
@@ -37,7 +37,7 @@ describe("instruction-st-preset", () => {
     const parsed = JSON.parse(rawDefault) as Record<string, unknown>;
     expect(detectStChatCompletionPreset(parsed)).toBe(true);
 
-    const normalized = createStAdvancedConfigFromPreset({
+    const normalized = createStBaseConfigFromPreset({
       preset: parsed,
       fileName: "Default.json",
       sensitiveImportMode: "keep",
@@ -96,7 +96,7 @@ describe("instruction-st-preset", () => {
       prompt_order: [],
     };
 
-    const removed = createStAdvancedConfigFromPreset({
+    const removed = createStBaseConfigFromPreset({
       preset,
       fileName: "Default.json",
       sensitiveImportMode: "remove",
@@ -110,7 +110,7 @@ describe("instruction-st-preset", () => {
       Object.prototype.hasOwnProperty.call(removed.responseConfig, "openai_model")
     ).toBe(false);
 
-    const kept = createStAdvancedConfigFromPreset({
+    const kept = createStBaseConfigFromPreset({
       preset,
       fileName: "Default.json",
       sensitiveImportMode: "keep",
@@ -119,7 +119,7 @@ describe("instruction-st-preset", () => {
   });
 
   test("uses prompt_order with preferred character id and splits pre/post history prompts", async () => {
-    const stAdvanced = createStAdvancedConfigFromPreset({
+    const stBase = createStBaseConfigFromPreset({
       preset: {
         prompts: [
           {
@@ -163,8 +163,8 @@ describe("instruction-st-preset", () => {
       sensitiveImportMode: "keep",
     });
 
-    const resolved = await resolveStAdvancedInstructionRuntime({
-      stAdvanced,
+    const resolved = await resolveStBaseInstructionRuntime({
+      stBase,
       context: {
         char: { name: "Lilly" },
         user: { name: "Dima" },
diff --git a/server/src/services/chat-core/instructions-repository.test.ts b/server/src/services/chat-core/instructions-repository.test.ts
new file mode 100644
index 00000000..271fa7ce
--- /dev/null
+++ b/server/src/services/chat-core/instructions-repository.test.ts
@@ -0,0 +1,122 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { sql } from "drizzle-orm";
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+
+import { initDb, resetDbForTests } from "../../db/client";
+import { ensureInstructionsSchema } from "../../db/ensure-instructions-schema";
+
+import {
+  createInstruction,
+  getInstructionById,
+} from "./instructions-repository";
+
+describe("instructions-repository", () => {
+  let tempDir = "";
+  let dbPath = "";
+
+  beforeEach(async () => {
+    resetDbForTests();
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "talespinner-instructions-"));
+    dbPath = path.join(tempDir, "db.sqlite");
+  });
+
+  afterEach(async () => {
+    resetDbForTests();
+    if (tempDir) {
+      await fs.rm(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  test("round-trips both basic and st_base instructions", async () => {
+    const db = await initDb({ dbPath });
+    await db.run(sql.raw("CREATE TABLE `chats` (`id` text PRIMARY KEY, `instruction_id` text);"));
+    await ensureInstructionsSchema();
+
+    const basic = await createInstruction({
+      name: "Basic",
+      kind: "basic",
+      templateText: "{{char.name}}",
+      meta: { scope: "test" },
+    });
+    const stBase = await createInstruction({
+      name: "ST",
+      kind: "st_base",
+      stBase: {
+        rawPreset: {},
+        prompts: [{ identifier: "main", content: "Hello" }],
+        promptOrder: [
+          {
+            character_id: 100001,
+            order: [{ identifier: "main", enabled: true }],
+          },
+        ],
+        responseConfig: { temperature: 0.7 },
+        importInfo: {
+          source: "sillytavern",
+          fileName: "Default.json",
+          importedAt: "2026-03-10T00:00:00.000Z",
+        },
+      },
+      meta: { scope: "test" },
+    });
+
+    const loadedBasic = await getInstructionById(basic.id);
+    const loadedStBase = await getInstructionById(stBase.id);
+
+    expect(loadedBasic).toMatchObject({
+      kind: "basic",
+      templateText: "{{char.name}}",
+      meta: { scope: "test" },
+    });
+    expect(loadedStBase).toMatchObject({
+      kind: "st_base",
+      stBase: expect.objectContaining({
+        responseConfig: { temperature: 0.7 },
+      }),
+      meta: { scope: "test" },
+    });
+  });
+
+  test("migrates legacy st_advanced rows to st_base storage", async () => {
+    const db = await initDb({ dbPath });
+    await db.run(
+      sql.raw(
+        "CREATE TABLE `instructions` (" +
+          "`id` text PRIMARY KEY NOT NULL," +
+          "`owner_id` text DEFAULT 'global' NOT NULL," +
+          "`name` text NOT NULL," +
+          "`engine` text DEFAULT 'liquidjs' NOT NULL," +
+          "`template_text` text NOT NULL," +
+          "`meta_json` text," +
+          "`created_at` integer NOT NULL," +
+          "`updated_at` integer NOT NULL" +
+        ");"
+      )
+    );
+    await db.run(sql.raw("CREATE TABLE `chats` (`id` text PRIMARY KEY, `prompt_template_id` text);"));
+    await db.run(
+      sql.raw(
+        "INSERT INTO `instructions` (`id`, `owner_id`, `name`, `engine`, `template_text`, `meta_json`, `created_at`, `updated_at`) VALUES (" +
+          "'legacy-st', 'global', 'Legacy ST', 'liquidjs', 'ignored', " +
+          `json('{"tsInstruction":{"version":1,"mode":"st_advanced","stAdvanced":{"rawPreset":{},"prompts":[{"identifier":"main","content":"Hello"}],"promptOrder":[{"character_id":100001,"order":[{"identifier":"main","enabled":true}]}],"responseConfig":{"temperature":0.5},"importInfo":{"source":"sillytavern","fileName":"Default.json","importedAt":"2026-03-10T00:00:00.000Z"}}},"legacy":true}')` +
+          ", 1, 1);"
+      )
+    );
+
+    await ensureInstructionsSchema();
+
+    const loaded = await getInstructionById("legacy-st");
+
+    expect(loaded).toMatchObject({
+      id: "legacy-st",
+      kind: "st_base",
+      stBase: expect.objectContaining({
+        responseConfig: { temperature: 0.5 },
+      }),
+      meta: { legacy: true },
+    });
+  });
+});
diff --git a/server/src/services/chat-core/instructions-repository.ts b/server/src/services/chat-core/instructions-repository.ts
index badc54c8..eaf69c00 100644
--- a/server/src/services/chat-core/instructions-repository.ts
+++ b/server/src/services/chat-core/instructions-repository.ts
@@ -5,27 +5,72 @@ import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { initDb } from "../../db/client";
 import { chats, instructions } from "../../db/schema";
 
-import type { InstructionMeta } from "@shared/types/instructions";
+import type {
+  InstructionKind,
+  InstructionMeta,
+  StBaseConfig,
+} from "@shared/types/instructions";
 
-export type InstructionDto = {
+type InstructionDtoBase = {
   id: string;
   ownerId: string;
   name: string;
   engine: "liquidjs";
-  templateText: string;
   meta: InstructionMeta | null;
   createdAt: Date;
   updatedAt: Date;
 };
 
+export type BasicInstructionDto = InstructionDtoBase & {
+  kind: "basic";
+  templateText: string;
+};
+
+export type StBaseInstructionDto = InstructionDtoBase & {
+  kind: "st_base";
+  stBase: StBaseConfig;
+};
+
+export type InstructionDto = BasicInstructionDto | StBaseInstructionDto;
+
+function parseInstructionMeta(value: string | null): InstructionMeta | null {
+  return safeJsonParse(value, null);
+}
+
+function parseStBaseConfig(row: typeof instructions.$inferSelect): StBaseConfig {
+  const parsed = safeJsonParse(row.stBaseJson, null);
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error(`Instruction ${row.id} is missing st_base payload`);
+  }
+  return parsed as StBaseConfig;
+}
+
 function rowToDto(row: typeof instructions.$inferSelect): InstructionDto {
+  const meta = parseInstructionMeta(row.metaJson);
+  const kind = row.kind as InstructionKind;
+
+  if (kind === "st_base") {
+    return {
+      id: row.id,
+      ownerId: row.ownerId,
+      name: row.name,
+      kind: "st_base",
+      engine: row.engine as "liquidjs",
+      stBase: parseStBaseConfig(row),
+      meta,
+      createdAt: row.createdAt,
+      updatedAt: row.updatedAt,
+    };
+  }
+
   return {
     id: row.id,
     ownerId: row.ownerId,
     name: row.name,
+    kind: "basic",
     engine: row.engine as "liquidjs",
     templateText: row.templateText,
-    meta: safeJsonParse(row.metaJson, null),
+    meta,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt,
   };
@@ -60,8 +105,17 @@ export async function createInstruction(params: {
   ownerId?: string;
   name: string;
   engine?: "liquidjs";
+  kind: "basic";
   templateText: string;
   meta?: InstructionMeta;
+} | {
+  id?: string;
+  ownerId?: string;
+  name: string;
+  engine?: "liquidjs";
+  kind: "st_base";
+  stBase: StBaseConfig;
+  meta?: InstructionMeta;
 }): Promise<InstructionDto> {
   const db = await initDb();
   const ts = new Date();
@@ -71,8 +125,11 @@ export async function createInstruction(params: {
     id,
     ownerId: params.ownerId ?? "global",
     name: params.name,
+    kind: params.kind,
     engine: params.engine ?? "liquidjs",
-    templateText: params.templateText,
+    templateText: params.kind === "basic" ? params.templateText : "",
+    stBaseJson:
+      params.kind === "st_base" ? safeJsonStringify(params.stBase) : null,
     metaJson:
       typeof params.meta === "undefined"
         ? null
@@ -83,12 +140,27 @@ export async function createInstruction(params: {
 
   const created = await getInstructionById(id);
   if (!created) {
+    if (params.kind === "basic") {
+      return {
+        id,
+        ownerId: params.ownerId ?? "global",
+        name: params.name,
+        kind: "basic",
+        engine: params.engine ?? "liquidjs",
+        templateText: params.templateText,
+        meta: params.meta ?? null,
+        createdAt: ts,
+        updatedAt: ts,
+      };
+    }
+
     return {
       id,
       ownerId: params.ownerId ?? "global",
       name: params.name,
+      kind: "st_base",
       engine: params.engine ?? "liquidjs",
-      templateText: params.templateText,
+      stBase: params.stBase,
       meta: params.meta ?? null,
       createdAt: ts,
       updatedAt: ts,
@@ -99,21 +171,33 @@ export async function createInstruction(params: {
 
 export async function updateInstruction(params: {
   id: string;
+  kind: InstructionKind;
   name?: string;
   engine?: "liquidjs";
   templateText?: string;
+  stBase?: StBaseConfig;
   meta?: InstructionMeta;
 }): Promise<InstructionDto | null> {
   const db = await initDb();
   const ts = new Date();
 
-  if (!(await getInstructionById(params.id))) return null;
+  const current = await getInstructionById(params.id);
+  if (!current) return null;
+  if (current.kind !== params.kind) {
+    throw new Error(
+      `Instruction ${params.id} kind mismatch: expected ${current.kind}, got ${params.kind}`
+    );
+  }
 
   const set: Partial<typeof instructions.$inferInsert> = { updatedAt: ts };
   if (typeof params.name === "string") set.name = params.name;
   if (typeof params.engine === "string") set.engine = params.engine;
-  if (typeof params.templateText === "string")
+  if (params.kind === "basic" && typeof params.templateText === "string") {
     set.templateText = params.templateText;
+  }
+  if (params.kind === "st_base" && typeof params.stBase !== "undefined") {
+    set.stBaseJson = safeJsonStringify(params.stBase);
+  }
 
   if (typeof params.meta !== "undefined") {
     set.metaJson = safeJsonStringify(params.meta);
diff --git a/server/src/services/chat-core/prompt-template-renderer.ts b/server/src/services/chat-core/prompt-template-renderer.ts
index 2e5c35a1..cb3c1502 100644
--- a/server/src/services/chat-core/prompt-template-renderer.ts
+++ b/server/src/services/chat-core/prompt-template-renderer.ts
@@ -6,9 +6,10 @@ export interface InstructionRenderContext {
   chat: unknown;
   messages: Array<{ role: string; content: string }>;
   rag: unknown;
-  // Persisted pipeline artifacts materialized as `art.<tag>.value/history`.
-  // v1: chat-scoped session only.
+  // Artifacts materialized as `art.<artifactId>.value/history`.
+  // `artByOpId` is a convenience alias for cross-operation references from templates.
   art?: Record<string, unknown>;
+  artByOpId?: Record<string, unknown>;
   now: string;
 
   // --- SillyTavern-like convenience variables (compat layer).
@@ -391,7 +392,7 @@ export async function renderLiquidTemplate(params: {
 
   // Additional passes: render again only if the output still looks like a template.
   // Important: if the output contains `{{` for non-template reasons (e.g. documentation/code),
-  // the next parse may throw — in that case we stop and return the previous output.
+  // the next parse may throw — in that case we stop and return the previous output.
   for (let pass = 2; pass <= maxPasses; pass++) {
     if (!mightContainLiquidSyntax(current)) break;
     if (current.length > maxOutputChars) break;
@@ -417,3 +418,4 @@ export async function renderLiquidTemplate(params: {
 
   return current;
 }
+
diff --git a/server/src/services/chat-entry-parts/parts-repository.ts b/server/src/services/chat-entry-parts/parts-repository.ts
index a537b964..6646ec31 100644
--- a/server/src/services/chat-entry-parts/parts-repository.ts
+++ b/server/src/services/chat-entry-parts/parts-repository.ts
@@ -85,7 +85,7 @@ type CreatePartParams = {
   variantId: string;
   channel: PartChannel;
   order: number;
-  payload: string | object;
+  payload: string | object | number | boolean | null;
   payloadFormat: PartPayloadFormat;
   schemaId?: string;
   label?: string;
diff --git a/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts b/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
index 44177777..9b11cd50 100644
--- a/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
+++ b/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
@@ -7,8 +7,9 @@ import { operationProfileSessionArtifacts } from "../../../db/schema";
 
 import type { ArtifactValue } from "../contracts";
 import type {
+  ArtifactFormat,
   ArtifactSemantics,
-  ArtifactUsage,
+  ArtifactWriteMode,
   OperationProfile,
 } from "@shared/types/operation-profiles";
 import type { OperationActivationState } from "../operations/operation-activation-intervals";
@@ -17,9 +18,9 @@ import type { OperationActivationState } from "../operations/operation-activatio
 const MAX_HISTORY_ITEMS = 20;
 const INTERNAL_OPERATION_ACTIVATION_TAG_PREFIX = "__sys_op_activation__:";
 
-function normalizeHistory(input: unknown, nextValue: string): string[] {
-  const parsed = Array.isArray(input) ? input.filter((v): v is string => typeof v === "string") : [];
-  return [...parsed, nextValue].slice(-MAX_HISTORY_ITEMS);
+function normalizeHistory(input: unknown, nextValue: unknown, maxItems: number): unknown[] {
+  const parsed = Array.isArray(input) ? input : [];
+  return [...parsed, nextValue].slice(-maxItems);
 }
 
 function normalizeActivationState(input: unknown): OperationActivationState {
@@ -58,16 +59,17 @@ export class ProfileSessionArtifactStore {
     const out: Record<string, ArtifactValue> = {};
     for (const row of rows) {
       if (row.tag.startsWith(INTERNAL_OPERATION_ACTIVATION_TAG_PREFIX)) continue;
-      const usage = (row.usage ?? "internal") as ArtifactUsage;
+      const format = ((row.usage ?? "markdown") as ArtifactFormat) || "markdown";
       const semantics = (row.semantics ?? "intermediate") as ArtifactSemantics;
-      const value = safeJsonParse<string>(row.valueJson, "");
-      const history = safeJsonParse<string[]>(row.historyJson, []);
+      const value = safeJsonParse<unknown>(row.valueJson, "");
+      const history = safeJsonParse<unknown[]>(row.historyJson, []);
       out[row.tag] = {
-        usage,
+        format,
         semantics,
         persistence: "persisted",
+        writeMode: "replace",
         value,
-        history: Array.isArray(history) ? history.filter((v) => typeof v === "string") : [],
+        history: Array.isArray(history) ? history : [],
       };
     }
     return out;
@@ -110,9 +112,14 @@ export class ProfileSessionArtifactStore {
     branchId: string;
     profile: OperationProfile | null;
     tag: string;
-    usage: ArtifactUsage;
+    format: ArtifactFormat;
     semantics: ArtifactSemantics;
-    value: string;
+    writeMode: ArtifactWriteMode;
+    history: {
+      enabled: boolean;
+      maxItems: number;
+    };
+    value: unknown;
   }): Promise<ArtifactValue> {
     const db = await initDb();
     const existingRows = await db
@@ -128,15 +135,21 @@ export class ProfileSessionArtifactStore {
 
     const now = new Date();
     const existing = existingRows[0];
-    const history = normalizeHistory(existing ? safeJsonParse(existing.historyJson, []) : [], params.value);
+    const history = params.history.enabled
+      ? normalizeHistory(
+          existing ? safeJsonParse(existing.historyJson, []) : [],
+          params.value,
+          params.history.maxItems
+        )
+      : [];
 
     if (existing) {
       await db
         .update(operationProfileSessionArtifacts)
         .set({
-          usage: params.usage,
+          usage: params.format,
           semantics: params.semantics,
-          valueJson: safeJsonStringify(params.value, "\"\""),
+          valueJson: safeJsonStringify(params.value, "null"),
           historyJson: safeJsonStringify(history, "[]"),
           updatedAt: now,
         })
@@ -152,18 +165,19 @@ export class ProfileSessionArtifactStore {
         profileVersion: params.profile?.version ?? null,
         operationProfileSessionId: params.profile?.operationProfileSessionId ?? null,
         tag: params.tag,
-        usage: params.usage,
+        usage: params.format,
         semantics: params.semantics,
-        valueJson: safeJsonStringify(params.value, "\"\""),
+        valueJson: safeJsonStringify(params.value, "null"),
         historyJson: safeJsonStringify(history, "[]"),
         updatedAt: now,
       });
     }
 
     return {
-      usage: params.usage,
+      format: params.format,
       semantics: params.semantics,
       persistence: "persisted",
+      writeMode: params.writeMode,
       value: params.value,
       history,
     };
@@ -213,7 +227,7 @@ export class ProfileSessionArtifactStore {
       profileVersion: params.profile?.version ?? null,
       operationProfileSessionId: params.profile?.operationProfileSessionId ?? null,
       tag,
-      usage: "internal",
+      usage: "json",
       semantics: "state",
       valueJson: safeJsonStringify(params.state, "{}"),
       historyJson: "[]",
diff --git a/server/src/services/chat-generation-v3/artifacts/run-artifact-store.test.ts b/server/src/services/chat-generation-v3/artifacts/run-artifact-store.test.ts
index a3009ded..67045e93 100644
--- a/server/src/services/chat-generation-v3/artifacts/run-artifact-store.test.ts
+++ b/server/src/services/chat-generation-v3/artifacts/run-artifact-store.test.ts
@@ -12,16 +12,19 @@ describe("RunArtifactStore", () => {
     const store = new RunArtifactStore();
 
     const artifact = store.upsert({
-      tag: "world_state",
-      usage: "internal",
+      artifactId: "world_state",
+      format: "markdown",
       semantics: "intermediate",
+      writeMode: "replace",
+      history: { enabled: true, maxItems: 20 },
       value: "v1",
     });
 
     expect(artifact).toEqual({
-      usage: "internal",
+      format: "markdown",
       semantics: "intermediate",
       persistence: "run_only",
+      writeMode: "replace",
       value: "v1",
       history: ["v1"],
     });
@@ -32,22 +35,27 @@ describe("RunArtifactStore", () => {
     const store = new RunArtifactStore();
 
     store.upsert({
-      tag: "memory",
-      usage: "internal",
+      artifactId: "memory",
+      format: "markdown",
       semantics: "intermediate",
+      writeMode: "replace",
+      history: { enabled: true, maxItems: 20 },
       value: "first",
     });
     const second = store.upsert({
-      tag: "memory",
-      usage: "prompt_only",
+      artifactId: "memory",
+      format: "json",
       semantics: "state",
+      writeMode: "append",
+      history: { enabled: true, maxItems: 20 },
       value: "second",
     });
 
     expect(second).toEqual({
-      usage: "prompt_only",
+      format: "json",
       semantics: "state",
       persistence: "run_only",
+      writeMode: "append",
       value: "second",
       history: ["first", "second"],
     });
@@ -56,30 +64,36 @@ describe("RunArtifactStore", () => {
   test("snapshot returns record with all tags", () => {
     const store = new RunArtifactStore();
     store.upsert({
-      tag: "a",
-      usage: "internal",
+      artifactId: "a",
+      format: "markdown",
       semantics: "intermediate",
+      writeMode: "replace",
+      history: { enabled: true, maxItems: 20 },
       value: "1",
     });
     store.upsert({
-      tag: "b",
-      usage: "ui_only",
+      artifactId: "b",
+      format: "text",
       semantics: "log/feed",
+      writeMode: "append",
+      history: { enabled: true, maxItems: 20 },
       value: "2",
     });
 
     expect(store.snapshot()).toEqual({
       a: {
-        usage: "internal",
+        format: "markdown",
         semantics: "intermediate",
         persistence: "run_only",
+        writeMode: "replace",
         value: "1",
         history: ["1"],
       },
       b: {
-        usage: "ui_only",
+        format: "text",
         semantics: "log/feed",
         persistence: "run_only",
+        writeMode: "append",
         value: "2",
         history: ["2"],
       },
diff --git a/server/src/services/chat-generation-v3/artifacts/run-artifact-store.ts b/server/src/services/chat-generation-v3/artifacts/run-artifact-store.ts
index a508561e..203cb241 100644
--- a/server/src/services/chat-generation-v3/artifacts/run-artifact-store.ts
+++ b/server/src/services/chat-generation-v3/artifacts/run-artifact-store.ts
@@ -1,5 +1,9 @@
 import type { ArtifactValue } from "../contracts";
-import type { ArtifactUsage, ArtifactSemantics } from "@shared/types/operation-profiles";
+import type {
+  ArtifactFormat,
+  ArtifactSemantics,
+  ArtifactWriteMode,
+} from "@shared/types/operation-profiles";
 
 
 export class RunArtifactStore {
@@ -16,32 +20,46 @@ export class RunArtifactStore {
   }
 
   upsert(params: {
-    tag: string;
-    usage: ArtifactUsage;
+    artifactId: string;
+    format: ArtifactFormat;
     semantics: ArtifactSemantics;
-    value: string;
+    writeMode: ArtifactWriteMode;
+    history: {
+      enabled: boolean;
+      maxItems: number;
+    };
+    value: unknown;
   }): ArtifactValue {
-    const existing = this.byTag.get(params.tag);
+    const existing = this.byTag.get(params.artifactId);
+    const nextHistory = existing
+      ? [...existing.history, params.value]
+      : [params.value];
+    const history = params.history.enabled
+      ? nextHistory.slice(-params.history.maxItems)
+      : [];
+
     if (existing) {
       const next: ArtifactValue = {
         ...existing,
-        usage: params.usage,
+        format: params.format,
         semantics: params.semantics,
+        writeMode: params.writeMode,
         value: params.value,
-        history: [...existing.history, params.value],
+        history,
       };
-      this.byTag.set(params.tag, next);
+      this.byTag.set(params.artifactId, next);
       return next;
     }
 
     const created: ArtifactValue = {
-      usage: params.usage,
+      format: params.format,
       semantics: params.semantics,
       persistence: "run_only",
+      writeMode: params.writeMode,
       value: params.value,
-      history: [params.value],
+      history,
     };
-    this.byTag.set(params.tag, created);
+    this.byTag.set(params.artifactId, created);
     return created;
   }
 }
diff --git a/server/src/services/chat-generation-v3/contracts.test.ts b/server/src/services/chat-generation-v3/contracts.test.ts
index b24c68cf..aae6b44c 100644
--- a/server/src/services/chat-generation-v3/contracts.test.ts
+++ b/server/src/services/chat-generation-v3/contracts.test.ts
@@ -1,74 +1,92 @@
 import { describe, expect, test } from "vitest";
 
-import { mapOperationOutputToEffectType } from "./contracts";
+import { getArtifactPrimaryEffectType, mapArtifactExposureToEffectTypes } from "./contracts";
 
-describe("mapOperationOutputToEffectType", () => {
-  test("maps artifacts output", () => {
+describe("artifact exposure mapping", () => {
+  test("maps artifact-only config", () => {
     expect(
-      mapOperationOutputToEffectType({
-        type: "artifacts",
-        writeArtifact: {
-          tag: "x",
-          persistence: "run_only",
-          usage: "internal",
-          semantics: "intermediate",
-        },
+      getArtifactPrimaryEffectType({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [],
       })
     ).toBe("artifact.upsert");
   });
 
-  test("maps turn canonicalization output for both targets", () => {
+  test("maps turn rewrite exposures for both targets", () => {
     expect(
-      mapOperationOutputToEffectType({
-        type: "turn_canonicalization",
-        canonicalization: {
-          kind: "replace_text",
-          target: "assistant",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [{ type: "turn_rewrite", target: "assistant_output_main", mode: "replace" }],
       })
-    ).toBe("turn.assistant.replace_text");
+    ).toEqual(["artifact.upsert", "turn.assistant.replace_text"]);
 
     expect(
-      mapOperationOutputToEffectType({
-        type: "turn_canonicalization",
-        canonicalization: {
-          kind: "replace_text",
-          target: "user",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [{ type: "turn_rewrite", target: "current_user_main", mode: "replace" }],
       })
-    ).toBe("turn.user.replace_text");
+    ).toEqual(["artifact.upsert", "turn.user.replace_text"]);
   });
 
-  test("maps prompt_time output kinds", () => {
+  test("maps prompt and ui exposure kinds", () => {
     expect(
-      mapOperationOutputToEffectType({
-        type: "prompt_time",
-        promptTime: {
-          kind: "system_update",
-          mode: "append",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [{ type: "prompt_part", target: "system", mode: "append" }],
       })
-    ).toBe("prompt.system_update");
+    ).toEqual(["artifact.upsert", "prompt.system_update"]);
 
     expect(
-      mapOperationOutputToEffectType({
-        type: "prompt_time",
-        promptTime: {
-          kind: "append_after_last_user",
-          role: "system",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [{ type: "prompt_message", role: "system", anchor: "after_last_user" }],
       })
-    ).toBe("prompt.append_after_last_user");
+    ).toEqual(["artifact.upsert", "prompt.append_after_last_user"]);
 
     expect(
-      mapOperationOutputToEffectType({
-        type: "prompt_time",
-        promptTime: {
-          kind: "insert_at_depth",
-          depthFromEnd: 1,
-          role: "assistant",
-        },
+      mapArtifactExposureToEffectTypes({
+        artifactId: "artifact:x",
+        tag: "x",
+        title: "X",
+        format: "markdown",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
+        exposures: [
+          { type: "prompt_message", role: "assistant", anchor: "depth_from_end", depthFromEnd: 1 },
+          { type: "ui_inline", role: "assistant", anchor: "after_last_user" },
+        ],
       })
-    ).toBe("prompt.insert_at_depth");
+    ).toEqual(["artifact.upsert", "prompt.insert_at_depth", "ui.inline"]);
   });
 });
diff --git a/server/src/services/chat-generation-v3/contracts.ts b/server/src/services/chat-generation-v3/contracts.ts
index 2cc35709..aed4ed12 100644
--- a/server/src/services/chat-generation-v3/contracts.ts
+++ b/server/src/services/chat-generation-v3/contracts.ts
@@ -1,11 +1,12 @@
 import type { GenerateMessage } from "@shared/types/generate";
 import type {
+  ArtifactExposure,
+  ArtifactFormat,
   ArtifactPersistence,
   ArtifactSemantics,
-  ArtifactUsage,
+  OperationArtifactConfig,
   OperationHook,
   OperationInProfile,
-  OperationOutput,
   OperationProfile,
   OperationTrigger,
 } from "@shared/types/operation-profiles";
@@ -33,20 +34,18 @@ export type PromptSnapshotV1 = {
   };
 };
 
-export type RunPersistenceTarget =
-  {
-    mode: "entry_parts";
-    assistantEntryId: string;
-    assistantMainPartId: string;
-    assistantReasoningPartId?: string;
-  };
+export type RunPersistenceTarget = {
+  mode: "entry_parts";
+  assistantEntryId: string;
+  assistantMainPartId: string;
+  assistantReasoningPartId?: string;
+};
 
-export type UserTurnTarget =
-  {
-    mode: "entry_parts";
-    userEntryId: string;
-    userMainPartId: string;
-  };
+export type UserTurnTarget = {
+  mode: "entry_parts";
+  userEntryId: string;
+  userMainPartId: string;
+};
 
 export type RunRequest = {
   requestId?: string;
@@ -99,11 +98,12 @@ export type RunContext = {
 };
 
 export type ArtifactValue = {
-  usage: ArtifactUsage;
+  format: ArtifactFormat;
   semantics: ArtifactSemantics;
   persistence: ArtifactPersistence;
-  value: string;
-  history: string[];
+  writeMode: "replace" | "append";
+  value: unknown;
+  history: unknown[];
 };
 
 export type PromptBuildOutput = {
@@ -141,11 +141,16 @@ export type RuntimeEffect =
   | {
       type: "artifact.upsert";
       opId: string;
-      tag: string;
+      artifactId: string;
+      format: ArtifactFormat;
       persistence: ArtifactPersistence;
-      usage: ArtifactUsage;
+      writeMode: "replace" | "append";
+      history: {
+        enabled: boolean;
+        maxItems: number;
+      };
       semantics: ArtifactSemantics;
-      value: string;
+      value: unknown;
     }
   | {
       type: "turn.user.replace_text";
@@ -156,6 +161,16 @@ export type RuntimeEffect =
       type: "turn.assistant.replace_text";
       opId: string;
       text: string;
+    }
+  | {
+      type: "ui.inline";
+      opId: string;
+      role: PromptDraftRole;
+      anchor: "after_last_user" | "depth_from_end";
+      depthFromEnd?: number;
+      payload: unknown;
+      format: ArtifactFormat;
+      source?: string;
     };
 
 export type OperationExecutionStatus = "done" | "skipped" | "error" | "aborted";
@@ -446,19 +461,102 @@ export type RunEvent =
           now: string;
           promptSystem: string;
           messages: Array<{ role: PromptDraftRole; content: string }>;
-          art: Record<string, { value: string; history: string[] }>;
+          art: Record<string, { value: unknown; history: unknown[] }>;
+          artByOpId?: Record<string, { value: unknown; history: unknown[] }>;
         };
       };
     };
 
-export function mapOperationOutputToEffectType(output: OperationOutput): RuntimeEffect["type"] {
-  if (output.type === "artifacts") return "artifact.upsert";
-  if (output.type === "turn_canonicalization") {
-    return output.canonicalization.target === "assistant"
-      ? "turn.assistant.replace_text"
-      : "turn.user.replace_text";
+function valueToText(value: unknown): string {
+  return typeof value === "string" ? value : JSON.stringify(value);
+}
+
+export function mapArtifactExposureToEffectTypes(
+  artifact: OperationArtifactConfig
+): RuntimeEffect["type"][] {
+  const effectTypes: RuntimeEffect["type"][] = ["artifact.upsert"];
+  for (const exposure of artifact.exposures) {
+    if (exposure.type === "prompt_part") {
+      effectTypes.push("prompt.system_update");
+      continue;
+    }
+    if (exposure.type === "prompt_message") {
+      effectTypes.push(
+        exposure.anchor === "after_last_user"
+          ? "prompt.append_after_last_user"
+          : "prompt.insert_at_depth"
+      );
+      continue;
+    }
+    if (exposure.type === "turn_rewrite") {
+      effectTypes.push(
+        exposure.target === "assistant_output_main"
+          ? "turn.assistant.replace_text"
+          : "turn.user.replace_text"
+      );
+      continue;
+    }
+    effectTypes.push("ui.inline");
   }
-  if (output.promptTime.kind === "system_update") return "prompt.system_update";
-  if (output.promptTime.kind === "append_after_last_user") return "prompt.append_after_last_user";
-  return "prompt.insert_at_depth";
+  return effectTypes;
+}
+
+export function getArtifactPrimaryEffectType(
+  artifact: OperationArtifactConfig
+): RuntimeEffect["type"] {
+  return mapArtifactExposureToEffectTypes(artifact)[0] ?? "artifact.upsert";
 }
+
+export function compileArtifactExposureEffect(params: {
+  opId: string;
+  artifact: OperationArtifactConfig;
+  exposure: ArtifactExposure;
+  value: unknown;
+}): RuntimeEffect {
+  const { opId, artifact, exposure, value } = params;
+  if (exposure.type === "prompt_part") {
+    return {
+      type: "prompt.system_update",
+      opId,
+      mode: exposure.mode,
+      payload: valueToText(value),
+      source: exposure.source,
+    };
+  }
+  if (exposure.type === "prompt_message") {
+    if (exposure.anchor === "after_last_user") {
+      return {
+        type: "prompt.append_after_last_user",
+        opId,
+        role: exposure.role,
+        payload: valueToText(value),
+        source: exposure.source,
+      };
+    }
+    return {
+      type: "prompt.insert_at_depth",
+      opId,
+      role: exposure.role,
+      depthFromEnd: exposure.depthFromEnd,
+      payload: valueToText(value),
+      source: exposure.source,
+    };
+  }
+  if (exposure.type === "turn_rewrite") {
+    const text = valueToText(value);
+    return exposure.target === "assistant_output_main"
+      ? { type: "turn.assistant.replace_text", opId, text }
+      : { type: "turn.user.replace_text", opId, text };
+  }
+  return {
+    type: "ui.inline",
+    opId,
+    role: exposure.role,
+    anchor: exposure.anchor,
+    depthFromEnd: exposure.anchor === "depth_from_end" ? exposure.depthFromEnd : undefined,
+    payload: value,
+    format: artifact.format,
+    source: exposure.source,
+  };
+}
+
diff --git a/server/src/services/chat-generation-v3/operations/commit-effects-phase.test.ts b/server/src/services/chat-generation-v3/operations/commit-effects-phase.test.ts
index db14017f..77e56c61 100644
--- a/server/src/services/chat-generation-v3/operations/commit-effects-phase.test.ts
+++ b/server/src/services/chat-generation-v3/operations/commit-effects-phase.test.ts
@@ -509,9 +509,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "artifact-1",
-            tag: "memory",
+            artifactId: "memory",
+            format: "markdown",
             persistence: "run_only",
-            usage: "internal",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "intermediate",
             value: "v1",
           },
@@ -526,9 +528,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "artifact-2",
-            tag: "memory",
+            artifactId: "memory",
+            format: "markdown",
             persistence: "run_only",
-            usage: "internal",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "intermediate",
             value: "v2",
           },
@@ -568,9 +572,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "persisted",
-            tag: "state",
+            artifactId: "state",
+            format: "markdown",
             persistence: "persisted",
-            usage: "prompt+ui",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "state",
             value: "v",
           },
@@ -632,9 +638,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "skip",
-            tag: "x",
+            artifactId: "x",
+            format: "markdown",
             persistence: "run_only",
-            usage: "internal",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "intermediate",
             value: "v",
           },
@@ -719,9 +727,11 @@ describe("commit effects phase", () => {
           {
             type: "artifact.upsert",
             opId: "c",
-            tag: "x",
+            artifactId: "x",
+            format: "markdown",
             persistence: "persisted",
-            usage: "internal",
+            writeMode: "replace",
+            history: { enabled: true, maxItems: 20 },
             semantics: "intermediate",
             value: "v",
           },
diff --git a/server/src/services/chat-generation-v3/operations/commit-effects-phase.ts b/server/src/services/chat-generation-v3/operations/commit-effects-phase.ts
index 4b4e0118..d763833f 100644
--- a/server/src/services/chat-generation-v3/operations/commit-effects-phase.ts
+++ b/server/src/services/chat-generation-v3/operations/commit-effects-phase.ts
@@ -4,12 +4,14 @@ import { type RunArtifactStore } from "../artifacts/run-artifact-store";
 import { applyArtifactEffect } from "./effect-handlers/artifact-effects";
 import { applyPromptEffect } from "./effect-handlers/prompt-effects";
 import { persistUserTurnText } from "./effect-handlers/turn-effects";
+import { persistUiInlineEffect } from "./effect-handlers/ui-effects";
 import { validateEffectForHook } from "./effect-policy";
 
 import type {
   CommitPhaseReport,
   OperationExecutionResult,
   RuntimeEffect,
+  RunPersistenceTarget,
   RunState,
   TurnUserCanonicalizationRecord,
   UserTurnTarget,
@@ -104,6 +106,7 @@ export async function commitEffectsPhase(params: {
   sessionKey: string | null;
   runState: RunState;
   runArtifactStore: RunArtifactStore;
+  persistenceTarget?: RunPersistenceTarget;
   userTurnTarget?: UserTurnTarget;
   onUserTurnCanonicalized?: (payload: TurnUserCanonicalizationRecord) => void;
   onCommitEvent?: (event: {
@@ -174,7 +177,7 @@ export async function commitEffectsPhase(params: {
             effect,
           });
           if (applied.persistence === "persisted") {
-            params.runState.persistedArtifactsSnapshot[effect.tag] = applied;
+            params.runState.persistedArtifactsSnapshot[effect.artifactId] = applied;
           }
           effectsReport.push({
             opId: opResult.opId,
@@ -188,6 +191,31 @@ export async function commitEffectsPhase(params: {
           continue;
         }
 
+        if (effect.type === "ui.inline") {
+          if (!params.persistenceTarget) {
+            throw new Error("UI inline effect requires persistence target");
+          }
+          await persistUiInlineEffect({
+            ownerId: params.ownerId,
+            chatId: params.chatId,
+            branchId: params.branchId,
+            hook: params.hook,
+            effect,
+            persistenceTarget: params.persistenceTarget,
+            userTurnTarget: currentUserTurnTarget,
+          });
+          effectsReport.push({
+            opId: opResult.opId,
+            effectType: effect.type,
+            status: "applied",
+          });
+          params.onCommitEvent?.({
+            type: "commit.effect_applied",
+            data: { hook: params.hook, opId: opResult.opId, effectType: effect.type },
+          });
+          continue;
+        }
+
         if (effect.type === "turn.user.replace_text") {
           const persisted = await persistUserTurnText({
             target: currentUserTurnTarget,
diff --git a/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.test.ts b/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.test.ts
index f13c3289..2ecf8c1e 100644
--- a/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.test.ts
+++ b/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.test.ts
@@ -17,18 +17,21 @@ describe("applyArtifactEffect", () => {
       profile: null,
       runStore: store,
       effect: {
-        tag: "tmp",
+        artifactId: "tmp",
+        format: "markdown",
         persistence: "run_only",
-        usage: "internal",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
         semantics: "intermediate",
         value: "v1",
       },
     });
 
     expect(out).toEqual({
-      usage: "internal",
+      format: "markdown",
       semantics: "intermediate",
       persistence: "run_only",
+      writeMode: "replace",
       value: "v1",
       history: ["v1"],
     });
@@ -45,9 +48,11 @@ describe("applyArtifactEffect", () => {
         profile: null,
         runStore: new RunArtifactStore(),
         effect: {
-          tag: "state",
+          artifactId: "state",
+          format: "markdown",
           persistence: "persisted",
-          usage: "prompt+ui",
+          writeMode: "replace",
+          history: { enabled: true, maxItems: 20 },
           semantics: "state",
           value: "v",
         },
@@ -57,9 +62,10 @@ describe("applyArtifactEffect", () => {
 
   test("delegates persisted write to ProfileSessionArtifactStore.upsert", async () => {
     const upsertSpy = vi.spyOn(ProfileSessionArtifactStore, "upsert").mockResolvedValue({
-      usage: "prompt+ui",
+      format: "json",
       semantics: "state",
       persistence: "persisted",
+      writeMode: "append",
       value: "persisted-v",
       history: ["persisted-v"],
     });
@@ -85,9 +91,11 @@ describe("applyArtifactEffect", () => {
       },
       runStore: new RunArtifactStore(),
       effect: {
-        tag: "world_state",
+        artifactId: "world_state",
+        format: "json",
         persistence: "persisted",
-        usage: "prompt+ui",
+        writeMode: "append",
+        history: { enabled: true, maxItems: 20 },
         semantics: "state",
         value: "persisted-v",
       },
@@ -98,15 +106,17 @@ describe("applyArtifactEffect", () => {
         ownerId: "global",
         sessionKey: "sess-1",
         tag: "world_state",
-        usage: "prompt+ui",
+        format: "json",
         semantics: "state",
+        writeMode: "append",
         value: "persisted-v",
       })
     );
     expect(out).toEqual({
-      usage: "prompt+ui",
+      format: "json",
       semantics: "state",
       persistence: "persisted",
+      writeMode: "append",
       value: "persisted-v",
       history: ["persisted-v"],
     });
diff --git a/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.ts b/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.ts
index a60622ff..6e7c31a8 100644
--- a/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.ts
+++ b/server/src/services/chat-generation-v3/operations/effect-handlers/artifact-effects.ts
@@ -13,18 +13,25 @@ export async function applyArtifactEffect(params: {
   profile: OperationProfile | null;
   runStore: RunArtifactStore;
   effect: {
-    tag: string;
+    artifactId: string;
+    format: "text" | "markdown" | "json";
     persistence: "persisted" | "run_only";
-    usage: string;
+    writeMode: "replace" | "append";
+    history: {
+      enabled: boolean;
+      maxItems: number;
+    };
     semantics: string;
-    value: string;
+    value: unknown;
   };
 }): Promise<ArtifactValue> {
   if (params.effect.persistence === "run_only") {
     return params.runStore.upsert({
-      tag: params.effect.tag,
-      usage: params.effect.usage as any,
+      artifactId: params.effect.artifactId,
+      format: params.effect.format as any,
       semantics: params.effect.semantics as any,
+      writeMode: params.effect.writeMode as any,
+      history: params.effect.history,
       value: params.effect.value,
     });
   }
@@ -39,9 +46,11 @@ export async function applyArtifactEffect(params: {
     chatId: params.chatId,
     branchId: params.branchId,
     profile: params.profile,
-    tag: params.effect.tag,
-    usage: params.effect.usage as any,
+    tag: params.effect.artifactId,
+    format: params.effect.format as any,
     semantics: params.effect.semantics as any,
+    writeMode: params.effect.writeMode as any,
+    history: params.effect.history,
     value: params.effect.value,
   });
   return persisted;
diff --git a/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.test.ts b/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.test.ts
new file mode 100644
index 00000000..d12e2c67
--- /dev/null
+++ b/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.test.ts
@@ -0,0 +1,222 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  getBranchCurrentTurn: vi.fn(),
+  listEntriesWithActiveVariants: vi.fn(),
+  getEntryById: vi.fn(),
+  getActiveVariantWithParts: vi.fn(),
+  getPartWithVariantContextById: vi.fn(),
+  createPart: vi.fn(),
+}));
+
+vi.mock("../../../chat-entry-parts/branch-turn-repository", () => ({
+  getBranchCurrentTurn: mocks.getBranchCurrentTurn,
+}));
+
+vi.mock("../../../chat-entry-parts/entries-repository", () => ({
+  listEntriesWithActiveVariants: mocks.listEntriesWithActiveVariants,
+  getEntryById: mocks.getEntryById,
+  getActiveVariantWithParts: mocks.getActiveVariantWithParts,
+}));
+
+vi.mock("../../../chat-entry-parts/parts-repository", () => ({
+  getPartWithVariantContextById: mocks.getPartWithVariantContextById,
+  createPart: mocks.createPart,
+}));
+
+import { persistUiInlineEffect } from "./ui-effects";
+
+describe("persistUiInlineEffect", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.getBranchCurrentTurn.mockResolvedValue(7);
+    mocks.listEntriesWithActiveVariants.mockResolvedValue([]);
+    mocks.getEntryById.mockResolvedValue({
+      entryId: "user-entry-current",
+      chatId: "chat-1",
+      branchId: "branch-1",
+      role: "user",
+      createdAt: 100,
+      activeVariantId: "variant-current",
+    });
+    mocks.getActiveVariantWithParts.mockResolvedValue({
+      variantId: "variant-current",
+      entryId: "user-entry-current",
+      kind: "generation",
+      createdAt: 100,
+      parts: [
+        {
+          partId: "user-main-current",
+          channel: "main",
+          order: 10,
+          payload: "hello",
+          payloadFormat: "markdown",
+          visibility: { ui: "always", prompt: true },
+          prompt: { serializerId: "asText" },
+          ui: { rendererId: "markdown" },
+          lifespan: "infinite",
+          createdTurn: 1,
+          source: "user",
+        },
+      ],
+    });
+    mocks.getPartWithVariantContextById.mockResolvedValue({
+      entryId: "user-entry-current",
+      variantId: "variant-current",
+      part: {
+        partId: "user-main-current",
+        channel: "main",
+        order: 10,
+        payload: "hello",
+        payloadFormat: "markdown",
+        visibility: { ui: "always", prompt: true },
+        prompt: { serializerId: "asText" },
+        ui: { rendererId: "markdown" },
+        lifespan: "infinite",
+        createdTurn: 1,
+        source: "user",
+      },
+    });
+    mocks.createPart.mockResolvedValue({
+      partId: "aux-inline",
+      variantId: "variant-current",
+    });
+  });
+
+  test("attaches inline UI part to current user target for after_last_user anchor", async () => {
+    await persistUiInlineEffect({
+      ownerId: "global",
+      chatId: "chat-1",
+      branchId: "branch-1",
+      hook: "before_main_llm",
+      effect: {
+        type: "ui.inline",
+        opId: "op-inline",
+        role: "user",
+        anchor: "after_last_user",
+        payload: { summary: "note" },
+        format: "json",
+      },
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
+      userTurnTarget: {
+        mode: "entry_parts",
+        userEntryId: "user-entry-current",
+        userMainPartId: "user-main-current",
+      },
+    });
+
+    expect(mocks.createPart).toHaveBeenCalledWith(
+      expect.objectContaining({
+        ownerId: "global",
+        variantId: "variant-current",
+        channel: "aux",
+        order: 20,
+        payload: { summary: "note" },
+        payloadFormat: "json",
+        createdTurn: 7,
+        visibility: { ui: "always", prompt: false },
+        tags: ["artifact_exposure", "ui_inline"],
+      })
+    );
+  });
+
+  test("uses depth_from_end over matching role entries when current target is not applicable", async () => {
+    mocks.listEntriesWithActiveVariants.mockResolvedValue([
+      {
+        entry: {
+          entryId: "assistant-1",
+          chatId: "chat-1",
+          branchId: "branch-1",
+          role: "assistant",
+          createdAt: 10,
+          activeVariantId: "variant-a1",
+        },
+        variant: {
+          variantId: "variant-a1",
+          entryId: "assistant-1",
+          kind: "generation",
+          createdAt: 10,
+          parts: [
+            {
+              partId: "assistant-1-main",
+              channel: "main",
+              order: 10,
+              payload: "a1",
+              payloadFormat: "markdown",
+              visibility: { ui: "always", prompt: true },
+              prompt: { serializerId: "asText" },
+              ui: { rendererId: "markdown" },
+              lifespan: "infinite",
+              createdTurn: 1,
+              source: "llm",
+            },
+          ],
+        },
+      },
+      {
+        entry: {
+          entryId: "assistant-2",
+          chatId: "chat-1",
+          branchId: "branch-1",
+          role: "assistant",
+          createdAt: 20,
+          activeVariantId: "variant-a2",
+        },
+        variant: {
+          variantId: "variant-a2",
+          entryId: "assistant-2",
+          kind: "generation",
+          createdAt: 20,
+          parts: [
+            {
+              partId: "assistant-2-main",
+              channel: "main",
+              order: 10,
+              payload: "a2",
+              payloadFormat: "markdown",
+              visibility: { ui: "always", prompt: true },
+              prompt: { serializerId: "asText" },
+              ui: { rendererId: "markdown" },
+              lifespan: "infinite",
+              createdTurn: 2,
+              source: "llm",
+            },
+          ],
+        },
+      },
+    ]);
+
+    await persistUiInlineEffect({
+      ownerId: "global",
+      chatId: "chat-1",
+      branchId: "branch-1",
+      hook: "before_main_llm",
+      effect: {
+        type: "ui.inline",
+        opId: "op-inline",
+        role: "assistant",
+        anchor: "depth_from_end",
+        depthFromEnd: 1,
+        payload: "older-target",
+        format: "markdown",
+      },
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
+    });
+
+    expect(mocks.createPart).toHaveBeenCalledWith(
+      expect.objectContaining({
+        variantId: "variant-a1",
+        payload: "older-target",
+        payloadFormat: "markdown",
+      })
+    );
+  });
+});
diff --git a/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.ts b/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.ts
new file mode 100644
index 00000000..9fd43fab
--- /dev/null
+++ b/server/src/services/chat-generation-v3/operations/effect-handlers/ui-effects.ts
@@ -0,0 +1,142 @@
+import { getBranchCurrentTurn } from "../../../chat-entry-parts/branch-turn-repository";
+import { getEntryById, getActiveVariantWithParts, listEntriesWithActiveVariants } from "../../../chat-entry-parts/entries-repository";
+import { createPart, getPartWithVariantContextById } from "../../../chat-entry-parts/parts-repository";
+
+import type { RunPersistenceTarget, RuntimeEffect, UserTurnTarget } from "../../contracts";
+import type { Part } from "@shared/types/chat-entry-parts";
+
+type ResolvedTarget = {
+  entryId: string;
+  variantId: string;
+  parts: Part[];
+};
+
+function compareByTimeAndId(a: { entryId: string; createdAt: number }, b: { entryId: string; createdAt: number }): number {
+  if (a.createdAt !== b.createdAt) return a.createdAt - b.createdAt;
+  return a.entryId.localeCompare(b.entryId);
+}
+
+async function resolveCurrentEntryTarget(partId: string): Promise<ResolvedTarget | null> {
+  const context = await getPartWithVariantContextById({ partId });
+  if (!context) return null;
+  const entry = await getEntryById({ entryId: context.entryId });
+  if (!entry) return null;
+  const variant = await getActiveVariantWithParts({ entry });
+  return {
+    entryId: context.entryId,
+    variantId: context.variantId,
+    parts: variant?.parts ?? [context.part],
+  };
+}
+
+async function resolveUiTarget(params: {
+  chatId: string;
+  branchId: string;
+  hook: "before_main_llm" | "after_main_llm";
+  effect: Extract<RuntimeEffect, { type: "ui.inline" }>;
+  persistenceTarget: RunPersistenceTarget;
+  userTurnTarget?: UserTurnTarget;
+}): Promise<ResolvedTarget | null> {
+  const entries = await listEntriesWithActiveVariants({
+    chatId: params.chatId,
+    branchId: params.branchId,
+    limit: 200,
+  });
+
+  const resolvedCandidates = entries
+    .filter((item) => item.entry.role === params.effect.role && item.variant)
+    .map((item) => ({
+      entryId: item.entry.entryId,
+      createdAt: item.entry.createdAt,
+      variantId: item.variant!.variantId,
+      parts: item.variant!.parts,
+    }))
+    .sort(compareByTimeAndId);
+
+  const maybeCurrentUser =
+    params.effect.role === "user" && params.userTurnTarget
+      ? await resolveCurrentEntryTarget(params.userTurnTarget.userMainPartId)
+      : null;
+  const maybeCurrentAssistant =
+    params.effect.role === "assistant" && params.hook === "after_main_llm"
+      ? await resolveCurrentEntryTarget(params.persistenceTarget.assistantMainPartId)
+      : null;
+
+  const withCurrent = [...resolvedCandidates];
+  if (maybeCurrentUser && !withCurrent.some((item) => item.entryId === maybeCurrentUser.entryId)) {
+    withCurrent.push({ ...maybeCurrentUser, createdAt: Number.MAX_SAFE_INTEGER });
+  }
+  if (maybeCurrentAssistant && !withCurrent.some((item) => item.entryId === maybeCurrentAssistant.entryId)) {
+    withCurrent.push({ ...maybeCurrentAssistant, createdAt: Number.MAX_SAFE_INTEGER });
+  }
+
+  const ordered = withCurrent.sort(compareByTimeAndId);
+  if (ordered.length === 0) return null;
+
+  if (params.effect.anchor === "after_last_user") {
+    if (params.effect.role === "user" && maybeCurrentUser) return maybeCurrentUser;
+    if (params.effect.role === "assistant" && maybeCurrentAssistant) return maybeCurrentAssistant;
+    const last = ordered[ordered.length - 1];
+    return last
+      ? {
+          entryId: last.entryId,
+          variantId: last.variantId,
+          parts: last.parts,
+        }
+      : null;
+  }
+
+  const depth = Math.max(0, Math.floor(params.effect.depthFromEnd ?? 0));
+  const target = ordered[ordered.length - 1 - depth];
+  if (!target) return null;
+  return {
+    entryId: target.entryId,
+    variantId: target.variantId,
+    parts: target.parts,
+  };
+}
+
+function resolveNextOrder(parts: Part[]): number {
+  const maxOrder = parts.reduce((max, part) => Math.max(max, part.order), 0);
+  return maxOrder + 10;
+}
+
+function normalizePartPayload(value: unknown): string | number | boolean | object | null {
+  if (value === null) return null;
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value;
+  }
+  if (typeof value === "object") return value;
+  return String(value ?? "");
+}
+
+export async function persistUiInlineEffect(params: {
+  ownerId: string;
+  chatId: string;
+  branchId: string;
+  hook: "before_main_llm" | "after_main_llm";
+  effect: Extract<RuntimeEffect, { type: "ui.inline" }>;
+  persistenceTarget: RunPersistenceTarget;
+  userTurnTarget?: UserTurnTarget;
+}): Promise<void> {
+  const target = await resolveUiTarget(params);
+  if (!target) return;
+
+  const currentTurn = await getBranchCurrentTurn({ branchId: params.branchId });
+  await createPart({
+    ownerId: params.ownerId,
+    variantId: target.variantId,
+    channel: "aux",
+    order: resolveNextOrder(target.parts),
+    payload: normalizePartPayload(params.effect.payload),
+    payloadFormat: params.effect.format,
+    visibility: {
+      ui: "always",
+      prompt: false,
+    },
+    lifespan: "infinite",
+    source: "agent",
+    createdTurn: currentTurn,
+    tags: ["artifact_exposure", "ui_inline"],
+  });
+}
diff --git a/server/src/services/chat-generation-v3/operations/effect-policy.test.ts b/server/src/services/chat-generation-v3/operations/effect-policy.test.ts
index f5605a76..785a3f87 100644
--- a/server/src/services/chat-generation-v3/operations/effect-policy.test.ts
+++ b/server/src/services/chat-generation-v3/operations/effect-policy.test.ts
@@ -34,9 +34,11 @@ describe("effect policy", () => {
       effect: {
         type: "artifact.upsert",
         opId: "op",
-        tag: "x",
+        artifactId: "artifact:x",
+        format: "markdown",
         persistence: "run_only",
-        usage: "internal",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
         semantics: "intermediate",
         value: "v",
       },
@@ -46,9 +48,11 @@ describe("effect policy", () => {
       effect: {
         type: "artifact.upsert",
         opId: "op",
-        tag: "x",
+        artifactId: "artifact:x",
+        format: "markdown",
         persistence: "run_only",
-        usage: "internal",
+        writeMode: "replace",
+        history: { enabled: true, maxItems: 20 },
         semantics: "intermediate",
         value: "v",
       },
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
index 607663e6..e0f20d43 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
@@ -3,7 +3,11 @@ import { beforeEach, describe, expect, test, vi } from "vitest";
 import { executeOperationsPhase } from "./execute-operations-phase";
 
 import type { InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
-import type { OperationInProfile, OperationOutput } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationInProfile,
+} from "@shared/types/operation-profiles";
 
 
 const mocks = vi.hoisted(() => ({
@@ -31,6 +35,24 @@ vi.mock("../../llm/llm-gateway-adapter", () => ({
 type TemplateOp = Extract<OperationInProfile, { kind: "template" }>;
 type LlmOp = Extract<OperationInProfile, { kind: "llm" }>;
 
+function toArtifact(params: {
+  opId: string;
+  kind: "template" | "llm" | "compute";
+  title: string;
+  output: LegacyOperationOutput;
+  llmOutputMode?: "text" | "json";
+}) {
+  return normalizeOperationArtifactConfig({
+    opId: params.opId,
+    kind: params.kind,
+    title: params.title,
+    rawParams: {
+      output: params.output,
+      ...(params.llmOutputMode ? { params: { outputMode: params.llmOutputMode } } : {}),
+    },
+  });
+}
+
 function streamOf(
   events: Array<
     | { type: "delta"; text: string }
@@ -62,7 +84,7 @@ function makeLlmOp(params: {
   opId: string;
   order: number;
   prompt: string;
-  output: OperationOutput;
+  output: LegacyOperationOutput;
   hooks?: LlmOp["config"]["hooks"];
   dependsOn?: string[];
   outputMode?: "text" | "json";
@@ -99,13 +121,19 @@ function makeLlmOp(params: {
           timeoutMs: params.timeoutMs,
           retry: params.retry,
         },
-        output: params.output,
+        artifact: toArtifact({
+          opId: params.opId,
+          kind: "llm",
+          title: params.opId,
+          output: params.output,
+          llmOutputMode: params.outputMode,
+        }),
       },
     },
   };
 }
 
-function artifactOutput(tag: string): OperationOutput {
+function artifactOutput(tag: string): LegacyOperationOutput {
   return {
     type: "artifacts",
     writeArtifact: {
@@ -121,7 +149,7 @@ function makeTemplateOp(params: {
   opId: string;
   order: number;
   template: string;
-  output: OperationOutput;
+  output: LegacyOperationOutput;
   hooks?: TemplateOp["config"]["hooks"];
   dependsOn?: string[];
   required?: boolean;
@@ -142,7 +170,12 @@ function makeTemplateOp(params: {
       params: {
         template: params.template,
         strictVariables: params.strictVariables,
-        output: params.output,
+        artifact: toArtifact({
+          opId: params.opId,
+          kind: "template",
+          title: params.opId,
+          output: params.output,
+        }),
       },
     },
   };
@@ -164,8 +197,13 @@ function makeComputeOp(params: {
       triggers: ["generate", "regenerate"],
       order: params.order,
       params: {
-        params: { noop: true },
-        output: artifactOutput(`compute_${params.opId}`),
+        params: { noop: true } as Record<string, unknown>,
+        artifact: toArtifact({
+          opId: params.opId,
+          kind: "compute",
+          title: params.opId,
+          output: artifactOutput(`compute_${params.opId}`),
+        }),
       },
     },
   };
@@ -293,7 +331,7 @@ describe("executeOperationsPhase", () => {
     expect(out[0]?.effects[0]).toMatchObject({
       type: "artifact.upsert",
       opId: "a",
-      tag: "greeting",
+      artifactId: "greeting",
       value: "hello",
     });
   });
@@ -335,7 +373,7 @@ describe("executeOperationsPhase", () => {
     expect(finished?.status).toBe("done");
     expect(finished?.result?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "greeting",
+      artifactId: "greeting",
       value: "hello",
     });
     expect(finished?.result?.debugSummary).toBe("artifact.upsert:5");
@@ -373,7 +411,7 @@ describe("executeOperationsPhase", () => {
     expect(byId.get("b")?.status).toBe("done");
     expect(byId.get("b")?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "seen",
+      artifactId: "seen",
       value: "seen=alpha",
     });
   });
@@ -423,7 +461,7 @@ describe("executeOperationsPhase", () => {
     expect(joined?.status).toBe("done");
     expect(joined?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "joined",
+      artifactId: "joined",
       value: "root-L|root-R",
     });
   });
@@ -458,7 +496,7 @@ describe("executeOperationsPhase", () => {
     expect(b?.status).toBe("done");
     expect(b?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "b",
+      artifactId: "b",
       value: "none",
     });
   });
@@ -644,7 +682,7 @@ describe("executeOperationsPhase", () => {
       templateContext: makeTemplateContext(),
     });
 
-    const effectTypes = out.map((r) => r.effects[0]?.type);
+    const effectTypes = out.map((r) => r.effects[1]?.type);
     expect(effectTypes).toEqual([
       "prompt.system_update",
       "prompt.append_after_last_user",
@@ -659,6 +697,7 @@ describe("executeOperationsPhase", () => {
         promptSystem: string;
         messages: Array<{ role: "system" | "user" | "assistant"; content: string }>;
         art: Record<string, { value: string; history: string[] }>;
+        artByOpId?: Record<string, { value: string; history: string[] }>;
       };
       rendered: string;
     }>();
@@ -708,7 +747,7 @@ describe("executeOperationsPhase", () => {
     const bResult = out.find((r) => r.opId === "b");
     expect(bResult?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "seen",
+      artifactId: "seen",
       value: "PROMPT|NOTE",
     });
 
@@ -717,6 +756,7 @@ describe("executeOperationsPhase", () => {
     expect(bDebug?.liquidContext.promptSystem).toBe("sys\n\nPROMPT");
     expect(bDebug?.liquidContext.messages[2]).toEqual({ role: "system", content: "PROMPT" });
     expect(bDebug?.liquidContext.art.note?.value).toBe("NOTE");
+    expect(bDebug?.liquidContext.artByOpId?.c?.value).toBe("NOTE");
   });
 
   test("exposes promptSystem to template operations with dependency replay", async () => {
@@ -752,7 +792,7 @@ describe("executeOperationsPhase", () => {
     const byId = new Map(out.map((item) => [item.opId, item] as const));
     expect(byId.get("read-system")?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "seen",
+      artifactId: "seen",
       value: "NEW_SYS",
     });
   });
@@ -823,7 +863,7 @@ describe("executeOperationsPhase", () => {
     });
     expect(out[0]?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "llm_tag",
+      artifactId: "llm_tag",
       value: "LLM RESULT",
     });
   });
@@ -859,7 +899,7 @@ describe("executeOperationsPhase", () => {
     expect(out[0]?.status).toBe("done");
     expect(out[0]?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "llm_json",
+      artifactId: "llm_json",
       value: '{"alpha":1,"beta":[2,3]}',
     });
   });
@@ -1156,7 +1196,7 @@ describe("executeOperationsPhase", () => {
     expect(out[0]?.status).toBe("done");
     expect(out[0]?.effects[0]).toMatchObject({
       type: "artifact.upsert",
-      tag: "llm_json_schema",
+      artifactId: "llm_json_schema",
     });
   });
 
@@ -1391,3 +1431,4 @@ describe("executeOperationsPhase", () => {
     }
   });
 });
+
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
index 2687bd6a..37247c10 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
@@ -3,7 +3,8 @@ import { runOrchestrator } from "@core/operation-orchestrator";
 
 import { renderLiquidTemplate } from "../../chat-core/prompt-template-renderer";
 import {
-  mapOperationOutputToEffectType,
+  compileArtifactExposureEffect,
+  getArtifactPrimaryEffectType,
   type OperationFinishedEventData,
   type OperationExecutionResult,
   type OperationSkipDetails,
@@ -21,7 +22,7 @@ import type { OperationHook, OperationInProfile, OperationTrigger } from "@share
 
 type PreviewState = {
   messages: PromptDraftMessage[];
-  artifacts: Record<string, { value: string; history: string[] }>;
+  artifacts: Record<string, { value: unknown; history: unknown[] }>;
   assistantText: string;
 };
 
@@ -61,60 +62,6 @@ function clonePreview(state: PreviewState): PreviewState {
   };
 }
 
-function toRuntimeEffect(params: {
-  opId: string;
-  output: OperationInProfile["config"]["params"]["output"];
-  rendered: string;
-}): RuntimeEffect {
-  const { opId, output, rendered } = params;
-  if (output.type === "artifacts") {
-    return {
-      type: "artifact.upsert",
-      opId,
-      tag: output.writeArtifact.tag,
-      persistence: output.writeArtifact.persistence,
-      usage: output.writeArtifact.usage,
-      semantics: output.writeArtifact.semantics,
-      value: rendered,
-    };
-  }
-
-  if (output.type === "turn_canonicalization") {
-    return output.canonicalization.target === "assistant"
-      ? { type: "turn.assistant.replace_text", opId, text: rendered }
-      : { type: "turn.user.replace_text", opId, text: rendered };
-  }
-
-  if (output.promptTime.kind === "system_update") {
-    return {
-      type: "prompt.system_update",
-      opId,
-      mode: output.promptTime.mode,
-      payload: rendered,
-      source: output.promptTime.source,
-    };
-  }
-
-  if (output.promptTime.kind === "append_after_last_user") {
-    return {
-      type: "prompt.append_after_last_user",
-      opId,
-      role: normalizePromptTimeRole(output.promptTime.role),
-      payload: rendered,
-      source: output.promptTime.source,
-    };
-  }
-
-  return {
-    type: "prompt.insert_at_depth",
-    opId,
-    role: normalizePromptTimeRole(output.promptTime.role),
-    depthFromEnd: normalizeDepthFromEnd(output.promptTime.depthFromEnd),
-    payload: rendered,
-    source: output.promptTime.source,
-  };
-}
-
 function applyEffectToPreview(state: PreviewState, effect: RuntimeEffect): PreviewState {
   if (
     effect.type === "prompt.system_update" ||
@@ -125,13 +72,16 @@ function applyEffectToPreview(state: PreviewState, effect: RuntimeEffect): Previ
   }
 
   if (effect.type === "artifact.upsert") {
-    const existing = state.artifacts[effect.tag];
-    const history = [...(existing?.history ?? []), effect.value];
+    const existing = state.artifacts[effect.artifactId];
+    const nextHistory = [...(existing?.history ?? []), effect.value];
+    const history = effect.history.enabled
+      ? nextHistory.slice(-effect.history.maxItems)
+      : [];
     return {
       ...state,
       artifacts: {
         ...state.artifacts,
-        [effect.tag]: {
+        [effect.artifactId]: {
           value: effect.value,
           history,
         },
@@ -148,6 +98,7 @@ function applyEffectToPreview(state: PreviewState, effect: RuntimeEffect): Previ
 
   const lastUserIdx = state.messages.map((m) => m.role).lastIndexOf("user");
   if (lastUserIdx < 0) return state;
+  if (effect.type === "ui.inline") return state;
   const nextMessages = state.messages.map((m, idx) =>
     idx === lastUserIdx ? { role: "user" as const, content: effect.text } : { ...m }
   );
@@ -169,15 +120,50 @@ function replayDependencyEffects(
   return state;
 }
 
-function buildTemplateContext(base: InstructionRenderContext, state: PreviewState): InstructionRenderContext {
+function mapArtifactsByOpId(
+  operations: OperationInProfile[],
+  artifacts: Record<string, { value: unknown; history: unknown[] }>
+): Record<string, { value: unknown; history: unknown[] }> {
+  const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
+  for (const op of operations) {
+    const artifact = artifacts[op.config.params.artifact.artifactId];
+    if (!artifact) continue;
+    mapped[op.opId] = { value: artifact.value, history: [...artifact.history] };
+  }
+  return mapped;
+}
+
+function mapArtifactsForTemplate(
+  operations: OperationInProfile[],
+  artifacts: Record<string, { value: unknown; history: unknown[] }>
+): Record<string, { value: unknown; history: unknown[] }> {
+  const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
+  for (const op of operations) {
+    const artifact = artifacts[op.config.params.artifact.artifactId];
+    if (!artifact) continue;
+    const snapshot = { value: artifact.value, history: [...artifact.history] };
+    mapped[op.config.params.artifact.tag] = snapshot;
+    mapped[op.config.params.artifact.artifactId] = snapshot;
+  }
+  return mapped;
+}
+
+function buildTemplateContext(
+  base: InstructionRenderContext,
+  state: PreviewState,
+  operations: OperationInProfile[]
+): InstructionRenderContext {
+  const art = {
+    ...(base.art ?? {}),
+    ...mapArtifactsForTemplate(operations, state.artifacts),
+  };
   return {
     ...base,
     promptSystem: resolvePromptSystem(state.messages),
-    art: {
-      ...(base.art ?? {}),
-      ...Object.fromEntries(
-        Object.entries(state.artifacts).map(([tag, value]) => [tag, { value: value.value, history: value.history }])
-      ),
+    art,
+    artByOpId: {
+      ...(base.artByOpId ?? {}),
+      ...mapArtifactsByOpId(operations, state.artifacts),
     },
     messages: state.messages.map((m) => ({ role: m.role, content: m.content })),
   };
@@ -186,7 +172,8 @@ function buildTemplateContext(base: InstructionRenderContext, state: PreviewStat
 function buildLiquidContextSnapshot(params: {
   base: InstructionRenderContext;
   state: PreviewState;
-}): {
+  operations: OperationInProfile[];
+  }): {
   char: unknown;
   user: unknown;
   chat: unknown;
@@ -194,7 +181,8 @@ function buildLiquidContextSnapshot(params: {
   now: string;
   promptSystem: string;
   messages: Array<{ role: PromptDraftMessage["role"]; content: string }>;
-  art: Record<string, { value: string; history: string[] }>;
+  art: Record<string, { value: unknown; history: unknown[] }>;
+  artByOpId?: Record<string, { value: unknown; history: unknown[] }>;
 } {
   return {
     char: params.base.char ?? {},
@@ -204,15 +192,10 @@ function buildLiquidContextSnapshot(params: {
     now: params.base.now,
     promptSystem: resolvePromptSystem(params.state.messages),
     messages: params.state.messages.map((m) => ({ role: m.role, content: m.content })),
-    art: Object.fromEntries(
-      Object.entries(params.state.artifacts).map(([tag, value]) => [
-        tag,
-        { value: value.value, history: [...value.history] },
-      ])
-    ),
+    art: mapArtifactsForTemplate(params.operations, params.state.artifacts),
+    artByOpId: params.base.artByOpId as Record<string, { value: unknown; history: unknown[] }> | undefined,
   };
 }
-
 function normalizeBlockedByOpIds(input: string[] | undefined): string[] {
   if (!input || input.length === 0) return [];
   return Array.from(new Set(input)).sort((a, b) => a.localeCompare(b));
@@ -362,7 +345,7 @@ export async function executeOperationsPhase(params: {
   >;
   executionMode: "concurrent" | "sequential";
   baseMessages: PromptDraftMessage[];
-  baseArtifacts: Record<string, { value: string; history: string[] }>;
+  baseArtifacts: Record<string, { value: unknown; history: unknown[] }>;
   assistantText: string;
   templateContext: InstructionRenderContext;
   abortSignal?: AbortSignal;
@@ -383,7 +366,8 @@ export async function executeOperationsPhase(params: {
       now: string;
       promptSystem: string;
       messages: Array<{ role: PromptDraftMessage["role"]; content: string }>;
-      art: Record<string, { value: string; history: string[] }>;
+      art: Record<string, { value: unknown; history: unknown[] }>;
+      artByOpId?: Record<string, { value: unknown; history: unknown[] }>;
     };
   }) => void;
 }): Promise<OperationExecutionResult[]> {
@@ -477,7 +461,7 @@ export async function executeOperationsPhase(params: {
           dependsOn: op.config.dependsOn,
           run: async () => {
             const depPreview = replayDependencyEffects(baseState, op.config.dependsOn ?? [], effectsByOpId);
-            const liquidContext = buildTemplateContext(params.templateContext, depPreview);
+            const liquidContext = buildTemplateContext(params.templateContext, depPreview, params.operations);
             let resolvedRendered = "";
             let debugSummary: string | undefined;
 
@@ -501,11 +485,29 @@ export async function executeOperationsPhase(params: {
               debugSummary = llmResult.debugSummary;
             }
 
-            const effect = toRuntimeEffect({
-              opId: op.opId,
-              output: op.config.params.output,
-              rendered: resolvedRendered,
-            });
+            const artifact = op.config.params.artifact;
+            const effects: RuntimeEffect[] = [
+              {
+                type: "artifact.upsert",
+                opId: op.opId,
+                artifactId: artifact.artifactId,
+                format: artifact.format,
+                persistence: artifact.persistence,
+                writeMode: artifact.writeMode,
+                history: artifact.history,
+                semantics: artifact.semantics ?? "intermediate",
+                value: resolvedRendered,
+              },
+              ...artifact.exposures.map((exposure) =>
+                compileArtifactExposureEffect({
+                  opId: op.opId,
+                  artifact,
+                  exposure,
+                  value: resolvedRendered,
+                })
+              ),
+            ];
+            const effect = effects[0];
             if (op.kind === "template") {
               params.onTemplateDebug?.({
                 hook: params.hook,
@@ -517,22 +519,22 @@ export async function executeOperationsPhase(params: {
                 liquidContext: buildLiquidContextSnapshot({
                   base: liquidContext,
                   state: depPreview,
+                  operations: params.operations,
                 }),
               });
             }
-            const effects: RuntimeEffect[] = [effect];
             effectsByOpId.set(op.opId, effects);
             taskResultByOpId.set(op.opId, {
               effects,
               debugSummary:
                 debugSummary ??
-                `${mapOperationOutputToEffectType(op.config.params.output)}:${resolvedRendered.length}`,
+                `${getArtifactPrimaryEffectType(op.config.params.artifact)}:${resolvedRendered.length}`,
             });
             return {
               effects,
               debugSummary:
                 debugSummary ??
-                `${mapOperationOutputToEffectType(op.config.params.output)}:${resolvedRendered.length}`,
+                `${getArtifactPrimaryEffectType(op.config.params.artifact)}:${resolvedRendered.length}`,
             };
           },
         })),
@@ -643,3 +645,5 @@ export async function executeOperationsPhase(params: {
 
   return all;
 }
+
+
diff --git a/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts b/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts
index 619710e6..3a3e568a 100644
--- a/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts
+++ b/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts
@@ -8,10 +8,27 @@ import { executeOperationsPhase } from "./execute-operations-phase";
 
 import type { InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
 import type { RunState } from "../contracts";
-import type { OperationInProfile, OperationOutput } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationInProfile,
+} from "@shared/types/operation-profiles";
 
 type TemplateOp = Extract<OperationInProfile, { kind: "template" }>;
 
+function toArtifact(params: {
+  opId: string;
+  title: string;
+  output: LegacyOperationOutput;
+}) {
+  return normalizeOperationArtifactConfig({
+    opId: params.opId,
+    kind: "template",
+    title: params.title,
+    rawParams: { output: params.output },
+  });
+}
+
 function makeTemplateContext(): InstructionRenderContext {
   return {
     char: {},
@@ -54,7 +71,7 @@ function makeRunState(): RunState {
   };
 }
 
-function artifactOutput(tag: string): OperationOutput {
+function artifactOutput(tag: string): LegacyOperationOutput {
   return {
     type: "artifacts",
     writeArtifact: {
@@ -70,7 +87,7 @@ function makeTemplateOp(params: {
   opId: string;
   order: number;
   template: string;
-  output: OperationOutput;
+  output: LegacyOperationOutput;
   hooks: Array<"before_main_llm" | "after_main_llm">;
   dependsOn?: string[];
   required?: boolean;
@@ -88,13 +105,17 @@ function makeTemplateOp(params: {
       dependsOn: params.dependsOn,
       params: {
         template: params.template,
-        output: params.output,
+        artifact: toArtifact({
+          opId: params.opId,
+          title: params.opId,
+          output: params.output,
+        }),
       },
     },
   };
 }
 
-function toExecuteArtifacts(runState: RunState): Record<string, { value: string; history: string[] }> {
+function toExecuteArtifacts(runState: RunState): Record<string, { value: unknown; history: unknown[] }> {
   const merged = { ...runState.persistedArtifactsSnapshot, ...runState.runArtifacts };
   return Object.fromEntries(
     Object.entries(merged).map(([tag, value]) => [
@@ -173,6 +194,11 @@ describe("operations flow integration (execute + commit)", () => {
       sessionKey: null,
       runState,
       runArtifactStore,
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
     });
 
     expect(beforeCommit.requiredError).toBe(false);
@@ -229,6 +255,11 @@ describe("operations flow integration (execute + commit)", () => {
       sessionKey: null,
       runState,
       runArtifactStore,
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
     });
 
     expect(afterCommit.requiredError).toBe(false);
@@ -283,12 +314,17 @@ describe("operations flow integration (execute + commit)", () => {
       sessionKey: null,
       runState,
       runArtifactStore,
+      persistenceTarget: {
+        mode: "entry_parts",
+        assistantEntryId: "assistant-entry",
+        assistantMainPartId: "assistant-main",
+      },
       onCommitEvent: events.onCommitEvent,
     });
 
     expect(afterCommit.requiredError).toBe(true);
     expect(afterCommit.report.status).toBe("error");
-    expect(afterCommit.report.effects[0]).toMatchObject({
+    expect(afterCommit.report.effects.find((effect) => effect.effectType === "prompt.system_update")).toMatchObject({
       opId: "after-invalid-required",
       effectType: "prompt.system_update",
       status: "error",
diff --git a/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts b/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
index 23aa5781..fb3afea0 100644
--- a/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
+++ b/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
@@ -6,6 +6,7 @@ import type {
   OperationSkipDetails,
   RunDebugStateSnapshotStage,
   RunEvent,
+  RunPersistenceTarget,
   RunState,
   UserTurnTarget,
 } from "../contracts";
@@ -25,7 +26,7 @@ type ExecuteOperationHookPhaseParams = {
   activationSkippedByOpId: ReadonlyMap<string, NonNullable<OperationSkipDetails["activation"]>>;
   executionMode: "concurrent" | "sequential";
   baseMessages: PromptDraftMessage[];
-  baseArtifacts: Record<string, { value: string; history: string[] }>;
+  baseArtifacts: Record<string, { value: unknown; history: unknown[] }>;
   assistantText: string;
   templateContext: {
     char: unknown;
@@ -44,6 +45,7 @@ type ExecuteOperationHookPhaseParams = {
   branchId: string;
   profile: OperationProfile | null;
   sessionKey: string | null;
+  persistenceTarget: RunPersistenceTarget;
   userTurnTarget?: UserTurnTarget;
   debugEnabled: boolean;
   emit: EmitRunEvent;
@@ -100,6 +102,7 @@ export async function* runOperationHookPhase(
       sessionKey: params.sessionKey,
       runState: params.runState,
       runArtifactStore: params.runArtifactStore,
+      persistenceTarget: params.persistenceTarget,
       userTurnTarget: params.userTurnTarget,
       onUserTurnCanonicalized: (data) => {
         params.emit("turn.user.canonicalized", data);
diff --git a/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts b/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts
index ff943b56..00731d2a 100644
--- a/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts
+++ b/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts
@@ -20,7 +20,7 @@ export function cloneLlmMessages(messages: GenerateMessage[]): GenerateMessage[]
 export function mergeArtifacts(
   persisted: RunState["persistedArtifactsSnapshot"],
   runOnly: RunState["runArtifacts"]
-): Record<string, { value: string; history: string[] }> {
+): Record<string, { value: unknown; history: unknown[] }> {
   return Object.fromEntries(
     Object.entries({ ...persisted, ...runOnly }).map(([tag, value]) => [
       tag,
@@ -36,18 +36,20 @@ export function mergeArtifactsForDebug(
   const merged: Record<string, ArtifactValue> = {};
   for (const [tag, value] of Object.entries(persisted)) {
     merged[tag] = {
-      usage: value.usage,
+      format: value.format,
       semantics: value.semantics,
       persistence: value.persistence,
+      writeMode: value.writeMode,
       value: value.value,
       history: [...value.history],
     };
   }
   for (const [tag, value] of Object.entries(runOnly)) {
     merged[tag] = {
-      usage: value.usage,
+      format: value.format,
       semantics: value.semantics,
       persistence: value.persistence,
+      writeMode: value.writeMode,
       value: value.value,
       history: [...value.history],
     };
diff --git a/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts b/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts
index 37d639e3..fe5f8359 100644
--- a/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts
+++ b/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts
@@ -138,45 +138,40 @@ describe("buildBasePrompt world-info integration", () => {
     );
   });
 
-  test("uses st_advanced meta to build system/pre/post prompts and derived settings", async () => {
+  test("uses st_base instructions to build system/pre/post prompts and derived settings", async () => {
     mocks.pickInstructionForChat.mockResolvedValue({
       id: "tpl-1",
       ownerId: "global",
       name: "tpl",
+      kind: "st_base",
       engine: "liquidjs",
-      templateText: "ignored",
-      meta: {
-        tsInstruction: {
-          version: 1,
-          mode: "st_advanced",
-          stAdvanced: {
-            rawPreset: {},
-            prompts: [
-              { identifier: "main", content: "Main {{char.name}}" },
-              { identifier: "jailbreak", content: "Post {{user.name}}" },
+      stBase: {
+        rawPreset: {},
+        prompts: [
+          { identifier: "main", content: "Main {{char.name}}" },
+          { identifier: "jailbreak", content: "Post {{user.name}}" },
+        ],
+        promptOrder: [
+          {
+            character_id: 100001,
+            order: [
+              { identifier: "main", enabled: true },
+              { identifier: "chatHistory", enabled: true },
+              { identifier: "jailbreak", enabled: true },
             ],
-            promptOrder: [
-              {
-                character_id: 100001,
-                order: [
-                  { identifier: "main", enabled: true },
-                  { identifier: "chatHistory", enabled: true },
-                  { identifier: "jailbreak", enabled: true },
-                ],
-              },
-            ],
-            responseConfig: {
-              temperature: 0.6,
-              openai_max_tokens: 444,
-            },
-            importInfo: {
-              source: "sillytavern",
-              fileName: "Default.json",
-              importedAt: new Date("2026-02-13T00:00:00.000Z").toISOString(),
-            },
           },
+        ],
+        responseConfig: {
+          temperature: 0.6,
+          openai_max_tokens: 444,
+        },
+        importInfo: {
+          source: "sillytavern",
+          fileName: "Default.json",
+          importedAt: new Date("2026-02-13T00:00:00.000Z").toISOString(),
         },
       },
+      meta: null,
       createdAt: new Date(),
       updatedAt: new Date(),
     });
@@ -216,4 +211,54 @@ describe("buildBasePrompt world-info integration", () => {
       maxTokens: 444,
     });
   });
+
+  test("fails when selected st_base instruction has no resolvable system prompt", async () => {
+    mocks.pickInstructionForChat.mockResolvedValue({
+      id: "tpl-1",
+      ownerId: "global",
+      name: "tpl",
+      kind: "st_base",
+      engine: "liquidjs",
+      stBase: {
+        rawPreset: {},
+        prompts: [{ identifier: "main", content: "" }],
+        promptOrder: [
+          {
+            character_id: 100001,
+            order: [{ identifier: "main", enabled: true }],
+          },
+        ],
+        responseConfig: {},
+        importInfo: {
+          source: "sillytavern",
+          fileName: "Default.json",
+          importedAt: new Date("2026-02-13T00:00:00.000Z").toISOString(),
+        },
+      },
+      meta: null,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    });
+    mocks.buildInstructionRenderContext.mockResolvedValue({
+      char: {},
+      user: {},
+      chat: {},
+      messages: [],
+      rag: {},
+      art: {},
+      now: new Date().toISOString(),
+    });
+    mocks.renderLiquidTemplate.mockResolvedValue("");
+
+    await expect(
+      buildBasePrompt({
+        ownerId: "global",
+        chatId: "chat",
+        branchId: "branch",
+        entityProfileId: "entity",
+        historyLimit: 50,
+        trigger: "generate",
+      })
+    ).rejects.toThrow("st_base instruction did not resolve a system prompt");
+  });
 });
diff --git a/server/src/services/chat-generation-v3/prompt/build-base-prompt.ts b/server/src/services/chat-generation-v3/prompt/build-base-prompt.ts
index 170085a3..cb2d9fa8 100644
--- a/server/src/services/chat-generation-v3/prompt/build-base-prompt.ts
+++ b/server/src/services/chat-generation-v3/prompt/build-base-prompt.ts
@@ -1,7 +1,6 @@
 import {
-  getTsInstructionMeta,
-  resolveStAdvancedInstructionRuntime,
-} from "../../chat-core/instruction-st-preset";
+  resolveStBaseInstructionRuntime,
+} from "../../chat-core/instruction-st-base";
 import { pickInstructionForChat } from "../../chat-core/instructions-repository";
 import { buildPromptDraft } from "../../chat-core/prompt-draft-builder";
 import {
@@ -84,35 +83,28 @@ export async function buildBasePrompt(params: {
   let preHistorySystemMessages: string[] = [];
   let postHistorySystemMessages: string[] = [];
   let instructionDerivedSettings: Record<string, unknown> = {};
-  try {
-    const template = await pickInstructionForChat({
-      ownerId: params.ownerId,
-      chatId: params.chatId,
-    });
-    if (template) {
-      const tsInstruction = getTsInstructionMeta(template.meta);
-      if (tsInstruction?.mode === "st_advanced" && tsInstruction.stAdvanced) {
-        const resolved = await resolveStAdvancedInstructionRuntime({
-          stAdvanced: tsInstruction.stAdvanced,
-          context: templateContext,
-        });
-        if (resolved.systemPrompt.trim().length > 0) {
-          systemPrompt = resolved.systemPrompt;
-        }
-        preHistorySystemMessages = resolved.preHistorySystemMessages;
-        postHistorySystemMessages = resolved.postHistorySystemMessages;
-        instructionDerivedSettings = resolved.derivedSettings;
-      } else {
-        const rendered = await renderLiquidTemplate({
-          templateText: template.templateText,
-          context: templateContext,
-        });
-        const normalized = rendered.trim();
-        if (normalized) systemPrompt = normalized;
-      }
+  const template = await pickInstructionForChat({
+    ownerId: params.ownerId,
+    chatId: params.chatId,
+  });
+  if (template) {
+    if (template.kind === "st_base") {
+      const resolved = await resolveStBaseInstructionRuntime({
+        stBase: template.stBase,
+        context: templateContext,
+      });
+      systemPrompt = resolved.systemPrompt;
+      preHistorySystemMessages = resolved.preHistorySystemMessages;
+      postHistorySystemMessages = resolved.postHistorySystemMessages;
+      instructionDerivedSettings = resolved.derivedSettings;
+    } else {
+      const rendered = await renderLiquidTemplate({
+        templateText: template.templateText,
+        context: templateContext,
+      });
+      const normalized = rendered.trim();
+      if (normalized) systemPrompt = normalized;
     }
-  } catch {
-    // Keep default fallback.
   }
 
   const builtPrompt = await buildPromptDraft({
diff --git a/server/src/services/chat-generation-v3/run-chat-generation-v3.ts b/server/src/services/chat-generation-v3/run-chat-generation-v3.ts
index 8ef409b6..66a46fb7 100644
--- a/server/src/services/chat-generation-v3/run-chat-generation-v3.ts
+++ b/server/src/services/chat-generation-v3/run-chat-generation-v3.ts
@@ -277,6 +277,7 @@ export async function* runChatGenerationV3(
       branchId: context.branchId,
       profile: resolved.profile,
       sessionKey: context.sessionKey,
+      persistenceTarget: request.persistenceTarget,
       userTurnTarget: request.userTurnTarget,
       debugEnabled,
       emit,
@@ -416,6 +417,7 @@ export async function* runChatGenerationV3(
           branchId: context.branchId,
           profile: resolved.profile,
           sessionKey: context.sessionKey,
+          persistenceTarget: request.persistenceTarget,
           userTurnTarget: request.userTurnTarget,
           debugEnabled,
           emit,
diff --git a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
index 1b66b78a..d76fe11b 100644
--- a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
+++ b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
@@ -19,7 +19,20 @@ import {
 } from "./operation-runtime-state";
 
 import type { Entry, Part, Variant } from "@shared/types/chat-entry-parts";
-import type { OperationInProfile } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationInProfile,
+} from "@shared/types/operation-profiles";
+
+function toTemplateArtifact(opId: string, output: LegacyOperationOutput) {
+  return normalizeOperationArtifactConfig({
+    opId,
+    kind: "template",
+    title: opId,
+    rawParams: { output },
+  });
+}
 
 function makeEntry(params: {
   entryId: string;
@@ -86,7 +99,7 @@ describe("operation runtime state bootstrap", () => {
           order: 1,
           params: {
             template: "x",
-            output: {
+            artifact: toTemplateArtifact("op-generate", {
               type: "artifacts",
               writeArtifact: {
                 tag: "state",
@@ -94,7 +107,7 @@ describe("operation runtime state bootstrap", () => {
                 usage: "internal",
                 semantics: "intermediate",
               },
-            },
+            }),
           },
         },
       },
@@ -111,7 +124,7 @@ describe("operation runtime state bootstrap", () => {
           order: 2,
           params: {
             template: "x",
-            output: {
+            artifact: toTemplateArtifact("op-regenerate-only", {
               type: "artifacts",
               writeArtifact: {
                 tag: "state2",
@@ -119,7 +132,7 @@ describe("operation runtime state bootstrap", () => {
                 usage: "internal",
                 semantics: "intermediate",
               },
-            },
+            }),
           },
         },
       },
@@ -162,7 +175,7 @@ describe("operation runtime state bootstrap", () => {
           order: 1,
           params: {
             template: "x",
-            output: {
+            artifact: toTemplateArtifact("op-turns", {
               type: "artifacts",
               writeArtifact: {
                 tag: "state",
@@ -170,7 +183,7 @@ describe("operation runtime state bootstrap", () => {
                 usage: "internal",
                 semantics: "intermediate",
               },
-            },
+            }),
           },
         },
       },
diff --git a/server/src/services/operations/operation-block-validator.test.ts b/server/src/services/operations/operation-block-validator.test.ts
index add2bd01..fae703e1 100644
--- a/server/src/services/operations/operation-block-validator.test.ts
+++ b/server/src/services/operations/operation-block-validator.test.ts
@@ -1,5 +1,7 @@
 import { describe, expect, test } from "vitest";
 
+import { buildOperationArtifactId } from "@shared/types/operation-profiles";
+
 import { validateOperationBlockUpsertInput } from "./operation-block-validator";
 
 describe("operation block validator", () => {
@@ -37,6 +39,8 @@ describe("operation block validator", () => {
       ],
     });
     expect(out.operations).toHaveLength(1);
+    expect(out.operations[0]?.config.params.artifact.artifactId).toBe(buildOperationArtifactId("6ff77029-5037-4d21-8ace-c9836f58a14b"));
+    expect(out.operations[0]?.config.params.artifact.tag).toBe("world_state");
   });
 
   test("rejects dependency to unknown opId", () => {
@@ -116,4 +120,88 @@ describe("operation block validator", () => {
       expect(issues.some((issue) => issue.message === "activation must include at least one interval")).toBe(true);
     }
   });
+
+  test("migrates legacy prompt_time output into artifact exposures", () => {
+    const out = validateOperationBlockUpsertInput({
+      name: "block",
+      enabled: true,
+      operations: [
+        {
+          opId: "7ff77029-5037-4d21-8ace-c9836f58a14b",
+          name: "prompt-op",
+          kind: "template",
+          config: {
+            enabled: true,
+            required: false,
+            hooks: ["before_main_llm"],
+            order: 10,
+            params: {
+              template: "Hello",
+              output: {
+                type: "prompt_time",
+                promptTime: {
+                  kind: "append_after_last_user",
+                  role: "system",
+                  source: "legacy",
+                },
+              },
+            },
+          },
+        },
+      ],
+    });
+
+    expect(out.operations[0]?.config.params.artifact.exposures).toEqual([
+      {
+        type: "prompt_message",
+        role: "system",
+        anchor: "after_last_user",
+        source: "legacy",
+      },
+    ]);
+  });
+
+  test("rejects prompt_message exposure in after_main_llm hook", () => {
+    expect(() =>
+      validateOperationBlockUpsertInput({
+        name: "block",
+        enabled: true,
+        operations: [
+          {
+            opId: "8ff77029-5037-4d21-8ace-c9836f58a14b",
+            name: "bad-op",
+            kind: "template",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["after_main_llm"],
+              order: 10,
+              params: {
+                template: "Hello",
+                artifact: {
+                  artifactId: "artifact:bad-op",
+                  tag: "bad_artifact",
+                  title: "Bad artifact",
+                  format: "markdown",
+                  persistence: "run_only",
+                  writeMode: "replace",
+                  history: {
+                    enabled: true,
+                    maxItems: 20,
+                  },
+                  exposures: [
+                    {
+                      type: "prompt_message",
+                      role: "system",
+                      anchor: "after_last_user",
+                    },
+                  ],
+                },
+              },
+            },
+          },
+        ],
+      })
+    ).toThrow(/before_main_llm/i);
+  });
 });
diff --git a/server/src/services/operations/operation-block-validator.ts b/server/src/services/operations/operation-block-validator.ts
index dcf93dd5..808511f5 100644
--- a/server/src/services/operations/operation-block-validator.ts
+++ b/server/src/services/operations/operation-block-validator.ts
@@ -7,17 +7,24 @@ import { validateLiquidTemplate } from "../chat-core/prompt-template-renderer";
 import { compileLlmJsonSchemaSpec } from "./llm-json-schema-spec";
 import { llmOperationParamsSchema } from "./llm-operation-params";
 
-import type {
-  OperationActivationConfig,
-  ArtifactPersistence,
-  ArtifactUsage,
-  OperationBlockExport,
-  OperationBlockUpsertInput,
-  OperationHook,
-  OperationInProfile,
-  OperationKind,
-  OperationTrigger,
-  PromptTimeMessageRole,
+import {
+  normalizeOperationArtifactConfig,
+  type ArtifactExposure,
+  type ArtifactFormat,
+  type ArtifactPersistence,
+  type ArtifactSemantics,
+  type ArtifactUsage,
+  type ArtifactWriteMode,
+  type OperationActivationConfig,
+  type OperationBlockExport,
+  type OperationBlockUpsertInput,
+  type OperationHook,
+  type OperationInProfile,
+  type OperationKind,
+  type OperationProfile,
+  type OperationTemplateParams,
+  type OperationTrigger,
+  type PromptTimeMessageRole,
 } from "@shared/types/operation-profiles";
 
 const uuidSchema = z.string().uuid();
@@ -40,6 +47,63 @@ const operationActivationSchema = z
 
 const artifactPersistenceSchema = z.enum(["persisted", "run_only"] satisfies ArtifactPersistence[]);
 const artifactUsageSchema = z.enum(["prompt_only", "ui_only", "prompt+ui", "internal"] satisfies ArtifactUsage[]);
+const artifactWriteModeSchema = z.enum(["replace", "append"] satisfies ArtifactWriteMode[]);
+const artifactFormatSchema = z.enum(["text", "markdown", "json"] satisfies ArtifactFormat[]);
+const promptTimeRoleSchema = z
+  .enum(["system", "developer", "user", "assistant"])
+  .transform((value): PromptTimeMessageRole => (value === "developer" ? "system" : value));
+
+const promptPartExposureSchema = z.object({
+  type: z.literal("prompt_part"),
+  target: z.literal("system"),
+  mode: z.enum(["prepend", "append", "replace"]),
+  source: z.string().trim().min(1).optional(),
+});
+
+const promptMessageExposureSchema = z.union([
+  z.object({
+    type: z.literal("prompt_message"),
+    role: promptTimeRoleSchema,
+    anchor: z.literal("after_last_user"),
+    source: z.string().trim().min(1).optional(),
+  }),
+  z.object({
+    type: z.literal("prompt_message"),
+    role: promptTimeRoleSchema,
+    anchor: z.literal("depth_from_end"),
+    depthFromEnd: z.number().finite().transform((value) => Math.max(0, Math.floor(Math.abs(value)))),
+    source: z.string().trim().min(1).optional(),
+  }),
+]);
+
+const turnRewriteExposureSchema = z.object({
+  type: z.literal("turn_rewrite"),
+  target: z.enum(["current_user_main", "assistant_output_main"]),
+  mode: z.literal("replace"),
+});
+
+const uiInlineExposureSchema = z.union([
+  z.object({
+    type: z.literal("ui_inline"),
+    role: promptTimeRoleSchema,
+    anchor: z.literal("after_last_user"),
+    source: z.string().trim().min(1).optional(),
+  }),
+  z.object({
+    type: z.literal("ui_inline"),
+    role: promptTimeRoleSchema,
+    anchor: z.literal("depth_from_end"),
+    depthFromEnd: z.number().finite().transform((value) => Math.max(0, Math.floor(Math.abs(value)))),
+    source: z.string().trim().min(1).optional(),
+  }),
+]);
+
+const artifactExposureSchema: z.ZodType<ArtifactExposure> = z.union([
+  promptPartExposureSchema,
+  promptMessageExposureSchema,
+  turnRewriteExposureSchema,
+  uiInlineExposureSchema,
+]);
 
 const artifactTagSchema = z
   .string()
@@ -47,27 +111,30 @@ const artifactTagSchema = z
   .min(1)
   .regex(/^[a-z][a-z0-9_]*$/, "tag must match ^[a-z][a-z0-9_]*$");
 
-function normalizePromptTimeRole(value: "system" | "developer" | "user" | "assistant"): PromptTimeMessageRole {
-  return value === "developer" ? "system" : value;
-}
-
-function normalizeDepthFromEnd(value: number): number {
-  if (!Number.isFinite(value)) return 0;
-  return Math.abs(Math.floor(value));
-}
-
-const promptTimeRoleSchema = z
-  .enum(["system", "developer", "user", "assistant"])
-  .transform((value): PromptTimeMessageRole => normalizePromptTimeRole(value));
+const artifactConfigSchema = z.object({
+  artifactId: z.string().trim().min(1),
+  tag: artifactTagSchema,
+  title: z.string().trim().min(1),
+  description: z.string().trim().min(1).optional(),
+  format: artifactFormatSchema,
+  persistence: artifactPersistenceSchema,
+  writeMode: artifactWriteModeSchema,
+  history: z.object({
+    enabled: z.boolean(),
+    maxItems: z.number().int().min(1),
+  }),
+  semantics: z.string().trim().min(1).optional(),
+  exposures: z.array(artifactExposureSchema),
+});
 
-const artifactWriteTargetSchema = z.object({
+const legacyArtifactWriteTargetSchema = z.object({
   tag: artifactTagSchema,
   persistence: artifactPersistenceSchema,
   usage: artifactUsageSchema,
   semantics: z.string().min(1),
 });
 
-const promptTimeEffectSchema = z.discriminatedUnion("kind", [
+const legacyPromptTimeEffectSchema = z.discriminatedUnion("kind", [
   z.object({
     kind: z.literal("append_after_last_user"),
     role: promptTimeRoleSchema,
@@ -80,62 +147,45 @@ const promptTimeEffectSchema = z.discriminatedUnion("kind", [
   }),
   z.object({
     kind: z.literal("insert_at_depth"),
-    depthFromEnd: z.number().finite().transform((value) => normalizeDepthFromEnd(value)),
+    depthFromEnd: z.number().finite().transform((value) => Math.max(0, Math.floor(Math.abs(value)))),
     role: promptTimeRoleSchema,
     source: z.string().trim().min(1).optional(),
   }),
 ]);
 
-const turnCanonicalizationEffectSchema = z.object({
-  kind: z.literal("replace_text"),
-  target: z.enum(["user", "assistant"]),
-});
-
-const operationOutputSchema = z.discriminatedUnion("type", [
+const legacyOperationOutputSchema = z.discriminatedUnion("type", [
   z.object({
     type: z.literal("artifacts"),
-    writeArtifact: artifactWriteTargetSchema,
+    writeArtifact: legacyArtifactWriteTargetSchema,
   }),
   z.object({
     type: z.literal("prompt_time"),
-    promptTime: promptTimeEffectSchema,
+    promptTime: legacyPromptTimeEffectSchema,
   }),
   z.object({
     type: z.literal("turn_canonicalization"),
-    canonicalization: turnCanonicalizationEffectSchema,
+    canonicalization: z.object({
+      kind: z.literal("replace_text"),
+      target: z.enum(["user", "assistant"]),
+    }),
   }),
 ]);
 
-const templateParamsNewSchema = z.object({
-  template: z.string(),
-  strictVariables: z.boolean().optional(),
-  output: operationOutputSchema,
-});
-
-const templateParamsLegacySchema = z.object({
+const templateParamsSchema = z.object({
   template: z.string(),
   strictVariables: z.boolean().optional(),
-  writeArtifact: artifactWriteTargetSchema,
-});
-
-const templateParamsSchema = z.union([templateParamsNewSchema, templateParamsLegacySchema]).transform((v) => {
-  if ("output" in v) return v;
-  return {
-    template: v.template,
-    strictVariables: v.strictVariables,
-    output: {
-      type: "artifacts" as const,
-      writeArtifact: v.writeArtifact,
-    },
-  };
+  artifact: artifactConfigSchema.optional(),
+  output: legacyOperationOutputSchema.optional(),
+  writeArtifact: legacyArtifactWriteTargetSchema.optional(),
 });
 
 const otherKindParamsSchema = z.object({
   params: z.record(z.string(), z.unknown()),
-  output: operationOutputSchema,
+  artifact: artifactConfigSchema.optional(),
+  output: legacyOperationOutputSchema.optional(),
 });
 
-const operationConfigTemplateSchema = z.object({
+const operationConfigBaseSchema = z.object({
   enabled: z.boolean(),
   required: z.boolean(),
   hooks: z.array(operationHookSchema).min(1),
@@ -143,63 +193,82 @@ const operationConfigTemplateSchema = z.object({
   activation: operationActivationSchema.optional(),
   order: z.number().finite(),
   dependsOn: z.array(uuidSchema).optional(),
+});
+
+const operationConfigTemplateSchema = operationConfigBaseSchema.extend({
   params: templateParamsSchema,
 });
 
-const operationConfigOtherSchema = z.object({
-  enabled: z.boolean(),
-  required: z.boolean(),
-  hooks: z.array(operationHookSchema).min(1),
-  triggers: z.array(operationTriggerSchema).min(1).optional(),
-  activation: operationActivationSchema.optional(),
-  order: z.number().finite(),
-  dependsOn: z.array(uuidSchema).optional(),
+const operationConfigOtherSchema = operationConfigBaseSchema.extend({
   params: otherKindParamsSchema,
 });
 
-const operationConfigLlmSchema = z.object({
-  enabled: z.boolean(),
-  required: z.boolean(),
-  hooks: z.array(operationHookSchema).min(1),
-  triggers: z.array(operationTriggerSchema).min(1).optional(),
-  activation: operationActivationSchema.optional(),
-  order: z.number().finite(),
-  dependsOn: z.array(uuidSchema).optional(),
+const operationConfigLlmSchema = operationConfigBaseSchema.extend({
   params: z.object({
     params: llmOperationParamsSchema,
-    output: operationOutputSchema,
+    artifact: artifactConfigSchema.optional(),
+    output: legacyOperationOutputSchema.optional(),
   }),
 });
 
-export const operationInProfileSchema: z.ZodType<OperationInProfile> = z.discriminatedUnion("kind", [
-  z.object({
-    opId: uuidSchema,
-    name: z.string().trim().min(1),
-    description: z.string().trim().min(1).optional(),
-    kind: z.literal("template"),
-    config: operationConfigTemplateSchema,
-  }),
-  z.object({
-    opId: uuidSchema,
-    name: z.string().trim().min(1),
-    description: z.string().trim().min(1).optional(),
-    kind: z.literal("llm"),
-    config: operationConfigLlmSchema,
-  }),
-  z.object({
-    opId: uuidSchema,
-    name: z.string().trim().min(1),
-    description: z.string().trim().min(1).optional(),
-    kind: z.enum([
-      "rag",
-      "tool",
-      "compute",
-      "transform",
-      "legacy",
-    ] satisfies Exclude<OperationKind, "template" | "llm">[]),
-    config: operationConfigOtherSchema,
-  }),
-]);
+export const operationInProfileSchema: z.ZodType<OperationInProfile> = z
+  .discriminatedUnion("kind", [
+    z.object({
+      opId: uuidSchema,
+      name: z.string().trim().min(1),
+      description: z.string().trim().min(1).optional(),
+      kind: z.literal("template"),
+      config: operationConfigTemplateSchema,
+    }),
+    z.object({
+      opId: uuidSchema,
+      name: z.string().trim().min(1),
+      description: z.string().trim().min(1).optional(),
+      kind: z.literal("llm"),
+      config: operationConfigLlmSchema,
+    }),
+    z.object({
+      opId: uuidSchema,
+      name: z.string().trim().min(1),
+      description: z.string().trim().min(1).optional(),
+      kind: z.enum([
+        "rag",
+        "tool",
+        "compute",
+        "transform",
+        "legacy",
+      ] satisfies Exclude<OperationKind, "template" | "llm">[]),
+      config: operationConfigOtherSchema,
+    }),
+  ])
+  .transform((op): OperationInProfile => {
+    const artifact = normalizeOperationArtifactConfig({
+      opId: op.opId,
+      kind: op.kind,
+      title: op.name,
+      rawParams: op.config.params,
+    });
+
+    const normalizedConfig = {
+      ...op.config,
+      params:
+        op.kind === "template"
+          ? {
+              template: op.config.params.template,
+              strictVariables: op.config.params.strictVariables,
+              artifact,
+            }
+          : {
+              params: op.config.params.params,
+              artifact,
+            },
+    };
+
+    return {
+      ...op,
+      config: normalizedConfig,
+    } as OperationInProfile;
+  });
 
 const upsertInputSchema: z.ZodType<OperationBlockUpsertInput> = z.object({
   name: z.string().trim().min(1),
@@ -280,6 +349,36 @@ function detectDependencyCycle(ops: OperationInProfile[]): boolean {
   return false;
 }
 
+function validateExposurePolicy(op: OperationInProfile, exposure: ArtifactExposure): void {
+  if (exposure.type === "prompt_part" || exposure.type === "prompt_message") {
+    if (!op.config.hooks.includes("before_main_llm")) {
+      throw new HttpError(
+        400,
+        `${exposure.type} requires before_main_llm hook`,
+        "VALIDATION_ERROR",
+        { opId: op.opId }
+      );
+    }
+    return;
+  }
+
+  if (exposure.type === "turn_rewrite" && exposure.target === "assistant_output_main") {
+    if (!op.config.hooks.includes("after_main_llm")) {
+      throw new HttpError(
+        400,
+        "turn_rewrite target=assistant_output_main requires after_main_llm hook",
+        "VALIDATION_ERROR",
+        { opId: op.opId }
+      );
+    }
+    return;
+  }
+
+  if (exposure.type === "ui_inline") {
+    return;
+  }
+}
+
 function validateCrossRules(input: ValidatedOperationBlockInput): void {
   const opsById = new Map<string, OperationInProfile>();
   const opIds = new Set<string>();
@@ -293,7 +392,13 @@ function validateCrossRules(input: ValidatedOperationBlockInput): void {
     opsById.set(op.opId, op);
   }
 
+  const artifactIds = new Map<string, string>();
+  const artifactTags = new Map<string, string>();
   for (const op of input.operations) {
+    for (const exposure of op.config.params.artifact.exposures) {
+      validateExposurePolicy(op, exposure);
+    }
+
     const deps = op.config.dependsOn ?? [];
     for (const dep of deps) {
       if (dep === op.opId) {
@@ -326,36 +431,9 @@ function validateCrossRules(input: ValidatedOperationBlockInput): void {
       }
     }
 
-    const params: Record<string, unknown> = op.config.params as unknown as Record<string, unknown>;
-    const output = params.output as
-      | { type: "prompt_time"; promptTime?: { target?: unknown } }
-      | { type: "turn_canonicalization"; canonicalization?: { target?: unknown } }
-      | undefined;
-    if (output?.type === "prompt_time" && !op.config.hooks.includes("before_main_llm")) {
-      throw new HttpError(
-        400,
-        "prompt_time output requires before_main_llm hook",
-        "VALIDATION_ERROR",
-        { opId: op.opId }
-      );
-    }
-
-    if (
-      output?.type === "turn_canonicalization" &&
-      output?.canonicalization?.target === "assistant" &&
-      !op.config.hooks.includes("after_main_llm")
-    ) {
-      throw new HttpError(
-        400,
-        "turn_canonicalization target=assistant requires after_main_llm hook",
-        "VALIDATION_ERROR",
-        { opId: op.opId }
-      );
-    }
-
     if (op.kind === "template") {
       try {
-        validateLiquidTemplate(op.config.params.template);
+        validateLiquidTemplate((op.config.params as OperationTemplateParams).template);
       } catch (error) {
         throw new HttpError(
           400,
@@ -422,27 +500,30 @@ function validateCrossRules(input: ValidatedOperationBlockInput): void {
         }
       }
     }
-  }
 
-  if (detectDependencyCycle(input.operations)) {
-    throw new HttpError(400, "Dependency cycle detected", "VALIDATION_ERROR");
-  }
+    const existingArtifactId = artifactIds.get(op.config.params.artifact.artifactId);
+    if (existingArtifactId) {
+      throw new HttpError(400, "Duplicate artifactId in block", "VALIDATION_ERROR", {
+        artifactId: op.config.params.artifact.artifactId,
+        opId: op.opId,
+        conflictsWithOpId: existingArtifactId,
+      });
+    }
+    artifactIds.set(op.config.params.artifact.artifactId, op.opId);
 
-  const tags = new Map<string, string>(); // tag -> opId
-  for (const op of input.operations) {
-    const params = op.config.params as unknown as { output?: { type?: string; writeArtifact?: { tag?: string } } };
-    if (!params?.output || params.output.type !== "artifacts") continue;
-    const tag = params.output.writeArtifact?.tag;
-    if (!tag) continue;
-    const existing = tags.get(tag);
-    if (existing) {
+    const existingTag = artifactTags.get(op.config.params.artifact.tag);
+    if (existingTag) {
       throw new HttpError(400, "Duplicate artifact tag in block", "VALIDATION_ERROR", {
-        tag,
+        tag: op.config.params.artifact.tag,
         opId: op.opId,
-        conflictsWithOpId: existing,
+        conflictsWithOpId: existingTag,
       });
     }
-    tags.set(tag, op.opId);
+    artifactTags.set(op.config.params.artifact.tag, op.opId);
+  }
+
+  if (detectDependencyCycle(input.operations)) {
+    throw new HttpError(400, "Dependency cycle detected", "VALIDATION_ERROR");
   }
 }
 
@@ -498,3 +579,32 @@ export function validateOperationBlockImport(raw: unknown): ValidatedOperationBl
     meta: parsed.data.meta,
   });
 }
+
+export function validateCompiledProfileArtifactWriters(profile: OperationProfile): void {
+  const artifactIds = new Map<string, string>();
+  const artifactTags = new Map<string, string>();
+
+  for (const op of profile.operations ?? []) {
+    const artifactId = op.config.params.artifact.artifactId;
+    const existingArtifactId = artifactIds.get(artifactId);
+    if (existingArtifactId) {
+      throw new HttpError(400, "Duplicate artifactId in compiled profile", "VALIDATION_ERROR", {
+        artifactId,
+        opId: op.opId,
+        conflictsWithOpId: existingArtifactId,
+      });
+    }
+    artifactIds.set(artifactId, op.opId);
+
+    const tag = op.config.params.artifact.tag;
+    const existingTag = artifactTags.get(tag);
+    if (existingTag) {
+      throw new HttpError(400, "Duplicate artifact tag in compiled profile", "VALIDATION_ERROR", {
+        tag,
+        opId: op.opId,
+        conflictsWithOpId: existingTag,
+      });
+    }
+    artifactTags.set(tag, op.opId);
+  }
+}
diff --git a/server/src/services/operations/operation-blocks-repository.ts b/server/src/services/operations/operation-blocks-repository.ts
index 7b2deb0e..4e12ede2 100644
--- a/server/src/services/operations/operation-blocks-repository.ts
+++ b/server/src/services/operations/operation-blocks-repository.ts
@@ -25,6 +25,13 @@ function parseSpecJson(value: string): OperationBlockSpecRow {
 
 function rowToDto(row: typeof operationBlocks.$inferSelect): OperationBlock {
   const spec = parseSpecJson(row.specJson);
+  const normalized = validateOperationBlockUpsertInput({
+    name: row.name,
+    description: row.description ?? undefined,
+    enabled: row.enabled,
+    operations: spec.operations,
+    meta: safeJsonParse(row.metaJson, null),
+  });
   return {
     blockId: row.id,
     ownerId: row.ownerId,
@@ -32,8 +39,8 @@ function rowToDto(row: typeof operationBlocks.$inferSelect): OperationBlock {
     description: row.description ?? undefined,
     enabled: row.enabled,
     version: row.version,
-    operations: spec.operations,
-    meta: safeJsonParse(row.metaJson, null),
+    operations: normalized.operations,
+    meta: normalized.meta,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt,
   };
diff --git a/server/src/services/operations/operation-profile-resolver.test.ts b/server/src/services/operations/operation-profile-resolver.test.ts
index b6a4e4e2..c494a830 100644
--- a/server/src/services/operations/operation-profile-resolver.test.ts
+++ b/server/src/services/operations/operation-profile-resolver.test.ts
@@ -2,7 +2,12 @@ import { describe, expect, test, vi } from "vitest";
 
 import { resolveCompiledOperationProfile } from "./operation-profile-resolver";
 
-import type { OperationBlock, OperationProfile } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationBlock,
+  type OperationProfile,
+} from "@shared/types/operation-profiles";
 
 const blockById = new Map<string, OperationBlock>();
 
@@ -14,6 +19,7 @@ function makeBlock(params: {
   blockId: string;
   version: number;
   order: number;
+  artifactTag?: string;
 }): OperationBlock {
   const now = new Date();
   return {
@@ -35,15 +41,22 @@ function makeBlock(params: {
           dependsOn: [],
           params: {
             template: "hello",
-            output: {
-              type: "artifacts",
-              writeArtifact: {
-                tag: `${params.blockId.replace(/-/g, "_")}_state`,
-                persistence: "run_only",
-                usage: "internal",
-                semantics: "intermediate",
+            artifact: normalizeOperationArtifactConfig({
+              opId: "op-1e6df0d9-2d3a-420f-83f0-a4e90ca1b056",
+              kind: "template",
+              title: "op",
+              rawParams: {
+                output: {
+                  type: "artifacts",
+                  writeArtifact: {
+                    tag: params.artifactTag ?? `${params.blockId.replace(/-/g, "_")}_state`,
+                    persistence: "run_only",
+                    usage: "internal",
+                    semantics: "intermediate",
+                  },
+                } satisfies LegacyOperationOutput,
               },
-            },
+            }),
           },
         },
       },
@@ -123,4 +136,40 @@ describe("operation profile resolver", () => {
     expect(out.blockVersionFingerprint).toBe("");
     expect(out.operations).toEqual([]);
   });
+
+  test("rejects duplicate artifact writers after block flattening", async () => {
+    blockById.clear();
+    blockById.set("11111111-1111-4111-8111-111111111111", makeBlock({
+      blockId: "11111111-1111-4111-8111-111111111111",
+      version: 1,
+      order: 10,
+      artifactTag: "shared_state",
+    }));
+    blockById.set("22222222-2222-4222-8222-222222222222", makeBlock({
+      blockId: "22222222-2222-4222-8222-222222222222",
+      version: 1,
+      order: 20,
+      artifactTag: "shared_state",
+    }));
+
+    const now = new Date();
+    const profile: OperationProfile = {
+      profileId: "profile-dup",
+      ownerId: "global",
+      name: "dup",
+      enabled: true,
+      executionMode: "sequential",
+      operationProfileSessionId: "sess-dup",
+      version: 1,
+      blockRefs: [
+        { blockId: "11111111-1111-4111-8111-111111111111", enabled: true, order: 10 },
+        { blockId: "22222222-2222-4222-8222-222222222222", enabled: true, order: 20 },
+      ],
+      meta: null,
+      createdAt: now,
+      updatedAt: now,
+    };
+
+    await expect(resolveCompiledOperationProfile(profile)).rejects.toThrow(/duplicate artifactId in compiled profile/i);
+  });
 });
diff --git a/server/src/services/operations/operation-profile-resolver.ts b/server/src/services/operations/operation-profile-resolver.ts
index 461f331e..6924576c 100644
--- a/server/src/services/operations/operation-profile-resolver.ts
+++ b/server/src/services/operations/operation-profile-resolver.ts
@@ -1,6 +1,7 @@
 import { HttpError } from "@core/middleware/error-handler";
 
 import { getOperationBlockById } from "./operation-blocks-repository";
+import { validateCompiledProfileArtifactWriters } from "./operation-block-validator";
 
 import type {
   OperationBlock,
@@ -72,6 +73,7 @@ export async function resolveCompiledOperationProfile(
 ): Promise<CompiledOperationProfile> {
   if (!Array.isArray(profile.blockRefs) || profile.blockRefs.length === 0) {
     const operations = profile.operations ?? [];
+    validateCompiledProfileArtifactWriters({ ...profile, operations });
     return {
       profile,
       operations,
@@ -101,6 +103,8 @@ export async function resolveCompiledOperationProfile(
     .map((item) => `${item.blockId}:${item.version}`)
     .join("|");
 
+  validateCompiledProfileArtifactWriters({ ...profile, operations });
+
   return {
     profile,
     operations,
diff --git a/server/src/services/operations/template-operations-runtime.test.ts b/server/src/services/operations/template-operations-runtime.test.ts
index bca3ab4a..90d901d6 100644
--- a/server/src/services/operations/template-operations-runtime.test.ts
+++ b/server/src/services/operations/template-operations-runtime.test.ts
@@ -5,7 +5,20 @@ import {
   applyTemplateOperationsToPromptDraft,
 } from "./template-operations-runtime";
 
-import type { OperationProfile } from "@shared/types/operation-profiles";
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationProfile,
+} from "@shared/types/operation-profiles";
+
+function toArtifact(opId: string, title: string, output: LegacyOperationOutput) {
+  return normalizeOperationArtifactConfig({
+    opId,
+    kind: "template",
+    title,
+    rawParams: { output },
+  });
+}
 
 
 function makeProfile(operations: OperationProfile["operations"]): OperationProfile {
@@ -41,10 +54,10 @@ describe("template operations runtime", () => {
           order: 10,
           params: {
             template: "[{{user.name}}]",
-            output: {
+            artifact: toArtifact("a7ea76de-6e0a-4f8a-a9fb-6eb9ad33c7df", "sys prepend", {
               type: "prompt_time",
               promptTime: { kind: "system_update", mode: "prepend", source: "t" },
-            },
+            }),
           },
         },
       },
@@ -86,10 +99,10 @@ describe("template operations runtime", () => {
           order: 10,
           params: {
             template: "normalized",
-            output: {
+            artifact: toArtifact("de11b614-a56e-4d95-9ee3-5a4ffb0b2d44", "assistant post", {
               type: "turn_canonicalization",
               canonicalization: { kind: "replace_text", target: "assistant" },
-            },
+            }),
           },
         },
       },
@@ -129,7 +142,7 @@ describe("template operations runtime", () => {
           order: 10,
           params: {
             template: "{{promptSystem}}",
-            output: {
+            artifact: toArtifact("4b7c0a14-5528-4f65-beb0-f8a65ef6a1f2", "copy system", {
               type: "artifacts",
               writeArtifact: {
                 tag: "sys_copy",
@@ -137,7 +150,7 @@ describe("template operations runtime", () => {
                 usage: "internal",
                 semantics: "intermediate",
               },
-            },
+            }),
           },
         },
       },
@@ -165,4 +178,77 @@ describe("template operations runtime", () => {
 
     expect(out.artifacts.sys_copy?.value).toBe("sys one\n\nsys two");
   });
+
+  test("provides artByOpId alias for cross-operation artifact references", async () => {
+    const profile = makeProfile([
+      {
+        opId: "producer-op",
+        name: "producer",
+        kind: "template",
+        config: {
+          enabled: true,
+          required: false,
+          hooks: ["before_main_llm"],
+          triggers: ["generate"],
+          order: 10,
+          params: {
+            template: "VALUE_FROM_PRODUCER",
+            artifact: toArtifact("producer-op", "producer", {
+              type: "artifacts",
+              writeArtifact: {
+                tag: "producer_value",
+                persistence: "run_only",
+                usage: "internal",
+                semantics: "intermediate",
+              },
+            }),
+          },
+        },
+      },
+      {
+        opId: "consumer-op",
+        name: "consumer",
+        kind: "template",
+        config: {
+          enabled: true,
+          required: false,
+          hooks: ["before_main_llm"],
+          triggers: ["generate"],
+          order: 20,
+          dependsOn: ["producer-op"],
+          params: {
+            template: "{{artByOpId[\"producer-op\"].value}}",
+            artifact: toArtifact("consumer-op", "consumer", {
+              type: "artifacts",
+              writeArtifact: {
+                tag: "consumer_value",
+                persistence: "run_only",
+                usage: "internal",
+                semantics: "intermediate",
+              },
+            }),
+          },
+        },
+      },
+    ]);
+
+    const out = await applyTemplateOperationsToPromptDraft({
+      runId: "run-4",
+      profile,
+      trigger: "generate",
+      draftMessages: [{ role: "user", content: "hello" }],
+      templateContext: {
+        char: {},
+        user: {},
+        chat: {},
+        messages: [],
+        rag: {},
+        art: {},
+        now: new Date().toISOString(),
+      },
+    });
+
+    expect(out.artifacts.consumer_value?.value).toBe("VALUE_FROM_PRODUCER");
+  });
 });
+
diff --git a/server/src/services/operations/template-operations-runtime.ts b/server/src/services/operations/template-operations-runtime.ts
index 8b160b6f..629b5e34 100644
--- a/server/src/services/operations/template-operations-runtime.ts
+++ b/server/src/services/operations/template-operations-runtime.ts
@@ -1,15 +1,11 @@
 import { runOrchestrator } from "@core/operation-orchestrator";
 
 import { renderLiquidTemplate } from "../chat-core/prompt-template-renderer";
+import { compileArtifactExposureEffect } from "../chat-generation-v3/contracts";
+import { applyPromptEffect } from "../chat-generation-v3/operations/effect-handlers/prompt-effects";
 
 import type { InstructionRenderContext } from "../chat-core/prompt-template-renderer";
-import type {
-  OperationInProfile,
-  OperationOutput,
-  OperationProfile,
-  OperationTrigger,
-} from "@shared/types/operation-profiles";
-
+import type { OperationInProfile, OperationProfile, OperationTrigger } from "@shared/types/operation-profiles";
 
 export type PromptDraftMessage = {
   role: "system" | "user" | "assistant";
@@ -18,7 +14,7 @@ export type PromptDraftMessage = {
 
 type RuntimeState = {
   messages: PromptDraftMessage[];
-  art: Record<string, { value: string; history: string[] }>;
+  art: Record<string, { value: unknown; history: unknown[] }>;
   assistantText: string;
 };
 
@@ -34,108 +30,89 @@ function normalizeText(value: unknown): string {
   return typeof value === "string" ? value : String(value ?? "");
 }
 
-function normalizePromptTimeRole(value: unknown): PromptDraftMessage["role"] {
-  if (value === "assistant" || value === "user" || value === "system") return value;
-  if (value === "developer") return "system";
-  return "system";
-}
-
-function resolveMinInsertIndex(messages: PromptDraftMessage[]): number {
-  const firstSystemIdx = messages.findIndex((message) => message.role === "system");
-  return firstSystemIdx >= 0 ? firstSystemIdx + 1 : 0;
-}
-
-function applyPromptTimeEffect(
-  state: RuntimeState,
-  output: Extract<OperationOutput, { type: "prompt_time" }>,
-  payload: string
-): void {
-  const promptTime = output.promptTime;
-  if (promptTime.kind === "system_update") {
-    const idx = state.messages.findIndex((m) => m.role === "system");
-    const current = idx >= 0 ? state.messages[idx]!.content : "";
-
-    const next =
-      promptTime.mode === "replace"
-        ? payload
-        : promptTime.mode === "prepend"
-          ? `${payload}${current}`
-          : `${current}${payload}`;
-
-    if (idx >= 0) state.messages[idx] = { role: "system", content: next };
-    else state.messages.unshift({ role: "system", content: next });
-    return;
-  }
-
-  if (promptTime.kind === "append_after_last_user") {
-    const lastUserIdx = state.messages.map((m) => m.role).lastIndexOf("user");
-    const insertAt = lastUserIdx >= 0 ? lastUserIdx + 1 : state.messages.length;
-    state.messages.splice(insertAt, 0, { role: normalizePromptTimeRole(promptTime.role), content: payload });
-    return;
+function mapArtifactsByOpId(
+  operations: OperationInProfile[],
+  artifacts: Record<string, { value: unknown; history: unknown[] }>
+): Record<string, { value: unknown; history: unknown[] }> {
+  const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
+  for (const op of operations) {
+    const artifact = artifacts[op.config.params.artifact.artifactId];
+    if (!artifact) continue;
+    mapped[op.opId] = { value: artifact.value, history: [...artifact.history] };
   }
-
-  const raw = state.messages.length - Math.abs(promptTime.depthFromEnd);
-  const minInsertAt = resolveMinInsertIndex(state.messages);
-  const insertAt = Math.min(state.messages.length, Math.max(minInsertAt, raw));
-  state.messages.splice(insertAt, 0, { role: normalizePromptTimeRole(promptTime.role), content: payload });
+  return mapped;
 }
 
-function applyTurnCanonicalizationEffect(
-  state: RuntimeState,
-  output: Extract<OperationOutput, { type: "turn_canonicalization" }>,
-  payload: string,
-  hook: "before_main_llm" | "after_main_llm"
-): void {
-  const canonicalization = output.canonicalization;
-  if (canonicalization.kind !== "replace_text") return;
-
-  if (canonicalization.target === "assistant" && hook === "after_main_llm") {
-    state.assistantText = payload;
-    return;
-  }
-
-  if (canonicalization.target === "user") {
-    const lastUserIdx = state.messages.map((m) => m.role).lastIndexOf("user");
-    if (lastUserIdx >= 0) {
-      state.messages[lastUserIdx] = { role: "user", content: payload };
-    }
+function mapArtifactsForTemplate(
+  operations: OperationInProfile[],
+  artifacts: Record<string, { value: unknown; history: unknown[] }>
+): Record<string, { value: unknown; history: unknown[] }> {
+  const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
+  for (const op of operations) {
+    const artifact = artifacts[op.config.params.artifact.artifactId];
+    if (!artifact) continue;
+    const snapshot = { value: artifact.value, history: [...artifact.history] };
+    mapped[op.config.params.artifact.tag] = snapshot;
+    mapped[op.config.params.artifact.artifactId] = snapshot;
   }
+  return mapped;
 }
 
-function applyOperationOutput(
+function applyArtifactEffects(
   state: RuntimeState,
-  output: OperationOutput,
-  payload: string,
-  hook: "before_main_llm" | "after_main_llm"
+  op: Extract<OperationInProfile, { kind: "template" }>,
+  payload: string
 ): void {
-  if (output.type === "prompt_time") {
-    if (hook === "before_main_llm") applyPromptTimeEffect(state, output, payload);
-    return;
-  }
-
-  if (output.type === "turn_canonicalization") {
-    applyTurnCanonicalizationEffect(state, output, payload, hook);
-    return;
-  }
-
-  const tag = output.writeArtifact.tag;
-  const existing = state.art[tag];
+  const artifact = op.config.params.artifact;
+  const existing = state.art[artifact.artifactId];
   if (existing) {
     existing.value = payload;
     existing.history.push(payload);
-    return;
+  } else {
+    state.art[artifact.artifactId] = { value: payload, history: [payload] };
+  }
+
+  for (const exposure of artifact.exposures) {
+    const effect = compileArtifactExposureEffect({
+      opId: op.opId,
+      artifact,
+      exposure,
+      value: payload,
+    });
+    if (
+      effect.type === "prompt.system_update" ||
+      effect.type === "prompt.append_after_last_user" ||
+      effect.type === "prompt.insert_at_depth"
+    ) {
+      state.messages = applyPromptEffect(state.messages, effect);
+      continue;
+    }
+    if (effect.type === "turn.assistant.replace_text") {
+      state.assistantText = effect.text;
+      continue;
+    }
+    if (effect.type === "turn.user.replace_text") {
+      const lastUserIdx = state.messages.map((m) => m.role).lastIndexOf("user");
+      if (lastUserIdx >= 0) {
+        state.messages[lastUserIdx] = { role: "user", content: effect.text };
+      }
+    }
   }
-  state.art[tag] = { value: payload, history: [payload] };
 }
 
 function buildOperationContext(
   base: InstructionRenderContext,
-  state: RuntimeState
+  state: RuntimeState,
+  operations: OperationInProfile[]
 ): InstructionRenderContext {
   return {
     ...base,
     promptSystem: resolvePromptSystem(state.messages),
-    art: { ...(base.art ?? {}), ...state.art },
+    art: { ...(base.art ?? {}), ...mapArtifactsForTemplate(operations, state.art) },
+    artByOpId: {
+      ...(base.artByOpId ?? {}),
+      ...mapArtifactsByOpId(operations, state.art),
+    },
     messages: state.messages.map((m) => ({ role: m.role, content: m.content })),
   };
 }
@@ -173,12 +150,12 @@ async function runTemplateOperations(params: {
         const rendered = normalizeText(
           await renderLiquidTemplate({
             templateText: op.config.params.template,
-            context: buildOperationContext(params.templateContext, params.state),
+            context: buildOperationContext(params.templateContext, params.state, params.profile.operations ?? []),
             options: { strictVariables: Boolean(op.config.params.strictVariables) },
           })
         );
 
-        applyOperationOutput(params.state, op.config.params.output, rendered, params.hook);
+        applyArtifactEffects(params.state, op, rendered);
         return { output: rendered };
       },
     })),
@@ -204,7 +181,7 @@ export async function applyTemplateOperationsToPromptDraft(params: {
   templateContext: InstructionRenderContext;
 }): Promise<{
   messages: PromptDraftMessage[];
-  artifacts: Record<string, { value: string; history: string[] }>;
+  artifacts: Record<string, { value: unknown; history: unknown[] }>;
 }> {
   const state: RuntimeState = {
     messages: params.draftMessages.map((m) => ({ ...m })),
@@ -233,7 +210,7 @@ export async function applyTemplateOperationsAfterMainLlm(params: {
   templateContext: InstructionRenderContext;
 }): Promise<{
   assistantText: string;
-  artifacts: Record<string, { value: string; history: string[] }>;
+  artifacts: Record<string, { value: unknown; history: unknown[] }>;
 }> {
   const state: RuntimeState = {
     messages: params.draftMessages.map((m) => ({ ...m })),
@@ -241,7 +218,6 @@ export async function applyTemplateOperationsAfterMainLlm(params: {
     assistantText: params.assistantText,
   };
 
-  // Make the generated assistant message available for after_main_llm templates.
   state.messages.push({ role: "assistant", content: state.assistantText });
 
   await runTemplateOperations({
@@ -258,3 +234,4 @@ export async function applyTemplateOperationsAfterMainLlm(params: {
     artifacts: state.art,
   };
 }
+
diff --git a/shared/types/instructions.ts b/shared/types/instructions.ts
index 91ba7e1f..90794111 100644
--- a/shared/types/instructions.ts
+++ b/shared/types/instructions.ts
@@ -1,27 +1,31 @@
-export type InstructionMode = "basic" | "st_advanced";
+export type InstructionKind = "basic" | "st_base";
 
-export type StPromptRole = "system" | "user" | "assistant";
+export type InstructionMeta = {
+  [key: string]: unknown;
+};
+
+export type StBasePromptRole = "system" | "user" | "assistant";
 
-export type StPrompt = {
+export type StBasePrompt = {
   identifier: string;
   name?: string;
-  role?: StPromptRole;
+  role?: StBasePromptRole;
   content?: string;
   system_prompt?: boolean;
   marker?: boolean;
 };
 
-export type StPromptOrderEntry = {
+export type StBasePromptOrderEntry = {
   identifier: string;
   enabled: boolean;
 };
 
-export type StPromptOrder = {
+export type StBasePromptOrder = {
   character_id: number;
-  order: StPromptOrderEntry[];
+  order: StBasePromptOrderEntry[];
 };
 
-export type StAdvancedResponseConfig = {
+export type StBaseResponseConfig = {
   temperature?: number;
   top_p?: number;
   top_k?: number;
@@ -39,27 +43,30 @@ export type StAdvancedResponseConfig = {
   stream_openai?: boolean;
 };
 
-export type StAdvancedImportInfo = {
+export type StBaseImportInfo = {
   source: "sillytavern";
   fileName: string;
   importedAt: string;
 };
 
-export type StAdvancedConfig = {
+export type StBaseConfig = {
   rawPreset: Record<string, unknown>;
-  prompts: StPrompt[];
-  promptOrder: StPromptOrder[];
-  responseConfig: StAdvancedResponseConfig;
-  importInfo: StAdvancedImportInfo;
+  prompts: StBasePrompt[];
+  promptOrder: StBasePromptOrder[];
+  responseConfig: StBaseResponseConfig;
+  importInfo: StBaseImportInfo;
 };
 
-export type TsInstructionMetaV1 = {
-  version: 1;
-  mode: InstructionMode;
-  stAdvanced?: StAdvancedConfig | null;
+export type BasicInstruction = {
+  kind: "basic";
+  templateText: string;
+  meta?: InstructionMeta | null;
 };
 
-export type InstructionMeta = {
-  tsInstruction?: TsInstructionMetaV1;
-  [key: string]: unknown;
+export type StBaseInstruction = {
+  kind: "st_base";
+  stBase: StBaseConfig;
+  meta?: InstructionMeta | null;
 };
+
+export type InstructionDefinition = BasicInstruction | StBaseInstruction;
diff --git a/shared/types/operation-profiles.ts b/shared/types/operation-profiles.ts
index c1fa0fa3..be5893f2 100644
--- a/shared/types/operation-profiles.ts
+++ b/shared/types/operation-profiles.ts
@@ -3,7 +3,9 @@ export type OperationTrigger = "generate" | "regenerate";
 
 export type OperationExecutionMode = "concurrent" | "sequential";
 
+export type ArtifactFormat = "text" | "markdown" | "json";
 export type ArtifactPersistence = "persisted" | "run_only";
+export type ArtifactWriteMode = "replace" | "append";
 export type ArtifactUsage = "prompt_only" | "ui_only" | "prompt+ui" | "internal";
 export type ArtifactSemantics =
   | "state"
@@ -23,14 +25,75 @@ export type OperationKind =
 
 export type PromptTimeMessageRole = "system" | "user" | "assistant";
 
-export type PromptTimeEffect =
+export type PromptPartExposure = {
+  type: "prompt_part";
+  target: "system";
+  mode: "prepend" | "append" | "replace";
+  source?: string;
+};
+
+export type PromptMessageExposure =
+  | {
+      type: "prompt_message";
+      role: PromptTimeMessageRole;
+      anchor: "after_last_user";
+      source?: string;
+    }
+  | {
+      type: "prompt_message";
+      role: PromptTimeMessageRole;
+      anchor: "depth_from_end";
+      depthFromEnd: number;
+      source?: string;
+    };
+
+export type TurnRewriteExposure = {
+  type: "turn_rewrite";
+  target: "current_user_main" | "assistant_output_main";
+  mode: "replace";
+};
+
+export type UiInlineExposure =
+  | {
+      type: "ui_inline";
+      role: PromptTimeMessageRole;
+      anchor: "after_last_user";
+      source?: string;
+    }
+  | {
+      type: "ui_inline";
+      role: PromptTimeMessageRole;
+      anchor: "depth_from_end";
+      depthFromEnd: number;
+      source?: string;
+    };
+
+export type ArtifactExposure =
+  | PromptPartExposure
+  | PromptMessageExposure
+  | TurnRewriteExposure
+  | UiInlineExposure;
+
+export type OperationArtifactConfig = {
+  artifactId: string;
+  tag: string;
+  title: string;
+  description?: string;
+  format: ArtifactFormat;
+  persistence: ArtifactPersistence;
+  writeMode: ArtifactWriteMode;
+  history: {
+    enabled: boolean;
+    maxItems: number;
+  };
+  semantics?: ArtifactSemantics;
+  exposures: ArtifactExposure[];
+};
+
+export type LegacyPromptTimeEffect =
   | {
       kind: "append_after_last_user";
       role: PromptTimeMessageRole;
-      /**
-       * Optional human-readable label to help debug where the injected message came from,
-       * e.g. "art.world_state" or "template_output".
-       */
       source?: string;
     }
   | {
@@ -40,59 +103,47 @@ export type PromptTimeEffect =
     }
   | {
       kind: "insert_at_depth";
-      /**
-       * 0 = insert at tail; N = insert N messages from the end (closer to tail).
-       */
       depthFromEnd: number;
       role: PromptTimeMessageRole;
       source?: string;
     };
 
-export type TurnCanonicalizationEffect = {
-  /**
-   * Minimal v2 UI placeholder for canonicalization.
-   * Current implementation is intentionally narrow and may expand with `effects` contract docs.
-   */
+export type LegacyTurnCanonicalizationEffect = {
   kind: "replace_text";
-  /**
-   * What part of the current turn to rewrite.
-   * - user: current user message (before_main_llm also allowed)
-   * - assistant: selected assistant variant (after_main_llm only)
-   */
   target: "user" | "assistant";
 };
 
-export type ArtifactWriteTarget = {
-  /**
-   * Invariant: to validate single-writer-per-tag at save-time, every operation must
-   * explicitly declare where it writes its output.
-   *
-   * `tag` is stored without the `art.` prefix.
-   */
+export type LegacyArtifactWriteTarget = {
   tag: string;
   persistence: ArtifactPersistence;
   usage: ArtifactUsage;
   semantics: ArtifactSemantics;
 };
 
-export type OperationOutput =
+export type LegacyOperationOutput =
   | {
       type: "artifacts";
-      writeArtifact: ArtifactWriteTarget;
+      writeArtifact: LegacyArtifactWriteTarget;
     }
   | {
       type: "prompt_time";
-      promptTime: PromptTimeEffect;
+      promptTime: LegacyPromptTimeEffect;
     }
   | {
       type: "turn_canonicalization";
-      canonicalization: TurnCanonicalizationEffect;
+      canonicalization: LegacyTurnCanonicalizationEffect;
     };
 
 export type OperationTemplateParams = {
   template: string;
   strictVariables?: boolean;
-  output: OperationOutput;
+  artifact: OperationArtifactConfig;
+};
+
+export type OperationTemplateLegacyParams = {
+  template: string;
+  strictVariables?: boolean;
+  output: LegacyOperationOutput;
 };
 
 export type LlmOperationRetryOn = "timeout" | "provider_error" | "rate_limit";
@@ -146,12 +197,13 @@ export type LlmOperationParams = {
 };
 
 export type OperationOtherKindParams<TParams extends Record<string, unknown> = Record<string, unknown>> = {
-  /**
-   * Draft UI for non-template operations:
-   * kind-specific params live here as a plain JSON object.
-   */
   params: TParams;
-  output: OperationOutput;
+  artifact: OperationArtifactConfig;
+};
+
+export type OperationOtherKindLegacyParams<TParams extends Record<string, unknown> = Record<string, unknown>> = {
+  params: TParams;
+  output: LegacyOperationOutput;
 };
 
 export type OperationParams = OperationTemplateParams | OperationOtherKindParams;
@@ -168,12 +220,12 @@ export type OperationConfig<TParams extends OperationParams = OperationParams> =
   triggers?: OperationTrigger[];
   activation?: OperationActivationConfig;
   order: number;
-  dependsOn?: string[]; // list of opId
+  dependsOn?: string[];
   params: TParams;
 };
 
 export type TemplateOperationInProfile = {
-  opId: string; // UUID
+  opId: string;
   name: string;
   description?: string;
   kind: "template";
@@ -181,7 +233,7 @@ export type TemplateOperationInProfile = {
 };
 
 export type LlmOperationInProfile = {
-  opId: string; // UUID
+  opId: string;
   name: string;
   description?: string;
   kind: "llm";
@@ -189,7 +241,7 @@ export type LlmOperationInProfile = {
 };
 
 export type GenericNonTemplateOperationInProfile = {
-  opId: string; // UUID
+  opId: string;
   name: string;
   description?: string;
   kind: Exclude<OperationKind, "template" | "llm">;
@@ -203,7 +255,7 @@ export type NonTemplateOperationInProfile =
 export type OperationInProfile = TemplateOperationInProfile | NonTemplateOperationInProfile;
 
 export type OperationBlock = {
-  blockId: string; // UUID
+  blockId: string;
   ownerId: string;
   name: string;
   description?: string;
@@ -233,24 +285,20 @@ export type OperationBlockExport = {
 };
 
 export type OperationProfileBlockRef = {
-  blockId: string; // UUID
+  blockId: string;
   enabled: boolean;
   order: number;
 };
 
 export type OperationProfile = {
-  profileId: string; // UUID
+  profileId: string;
   ownerId: string;
   name: string;
   description?: string;
   enabled: boolean;
   executionMode: OperationExecutionMode;
-  operationProfileSessionId: string; // UUID (resettable)
+  operationProfileSessionId: string;
   version: number;
-  /**
-   * Runtime-only flattened operations snapshot.
-   * Persisted profile data uses `blockRefs`.
-   */
   operations?: OperationInProfile[];
   blockRefs: OperationProfileBlockRef[];
   meta: unknown | null;
@@ -287,7 +335,6 @@ export type OperationProfileExportV2 = {
 };
 
 export type OperationProfileLegacyExportV1 = {
-  // `profileId` is intentionally optional on import.
   profileId?: string;
   name: string;
   description?: string;
@@ -305,3 +352,316 @@ export type OperationProfileSettings = {
   updatedAt: Date;
 };
 
+const DEFAULT_ARTIFACT_HISTORY_MAX_ITEMS = 20;
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function asString(value: unknown): string | undefined {
+  return typeof value === "string" ? value : undefined;
+}
+
+function asBoolean(value: unknown): boolean | undefined {
+  return typeof value === "boolean" ? value : undefined;
+}
+
+function asFiniteNumber(value: unknown): number | undefined {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+
+function normalizePositiveInteger(value: unknown, fallback: number): number {
+  const parsed = asFiniteNumber(value);
+  if (typeof parsed === "undefined") return fallback;
+  return Math.max(1, Math.floor(parsed));
+}
+
+function normalizeNonNegativeInteger(value: unknown, fallback = 0): number {
+  const parsed = asFiniteNumber(value);
+  if (typeof parsed === "undefined") return fallback;
+  return Math.max(0, Math.floor(Math.abs(parsed)));
+}
+
+function normalizePromptRole(value: unknown): PromptTimeMessageRole {
+  if (value === "system" || value === "user" || value === "assistant") return value;
+  if (value === "developer") return "system";
+  return "system";
+}
+
+export function buildOperationArtifactId(opId: string): string {
+  return `artifact:${opId}`;
+}
+
+function sanitizeArtifactTagSegment(value: string): string {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+}
+
+export function buildDefaultArtifactTag(params: { opId: string; title?: string }): string {
+  const fromTitle = typeof params.title === "string" ? sanitizeArtifactTagSegment(params.title) : "";
+  if (/^[a-z][a-z0-9_]*$/.test(fromTitle)) return fromTitle;
+
+  const suffix = params.opId.replace(/[^a-zA-Z0-9]/g, "").toLowerCase().slice(0, 8) || "item";
+  return `artifact_${suffix}`;
+}
+
+function normalizeArtifactTag(value: unknown, fallback: string): string {
+  const normalized = typeof value === "string" ? sanitizeArtifactTagSegment(value) : "";
+  return /^[a-z][a-z0-9_]*$/.test(normalized) ? normalized : fallback;
+}
+
+export function inferDefaultArtifactFormat(params: {
+  kind: OperationKind;
+  llmOutputMode?: "text" | "json";
+}): ArtifactFormat {
+  if (params.kind === "llm" && params.llmOutputMode === "json") return "json";
+  return "markdown";
+}
+
+export function makeDefaultOperationArtifactConfig(params: {
+  opId: string;
+  kind: OperationKind;
+  llmOutputMode?: "text" | "json";
+  title?: string;
+}): OperationArtifactConfig {
+  return {
+    artifactId: buildOperationArtifactId(params.opId),
+    tag: buildDefaultArtifactTag({ opId: params.opId, title: params.title }),
+    title: params.title?.trim() || `Artifact ${params.opId.slice(0, 8)}`,
+    format: inferDefaultArtifactFormat({
+      kind: params.kind,
+      llmOutputMode: params.llmOutputMode,
+    }),
+    persistence: "run_only",
+    writeMode: "replace",
+    history: {
+      enabled: true,
+      maxItems: DEFAULT_ARTIFACT_HISTORY_MAX_ITEMS,
+    },
+    exposures: [],
+  };
+}
+
+function normalizeExposure(raw: unknown): ArtifactExposure | null {
+  if (!isRecord(raw) || typeof raw.type !== "string") return null;
+
+  if (raw.type === "prompt_part") {
+    const mode =
+      raw.mode === "prepend" || raw.mode === "append" || raw.mode === "replace"
+        ? raw.mode
+        : "append";
+    return {
+      type: "prompt_part",
+      target: "system",
+      mode,
+      ...(asString(raw.source)?.trim() ? { source: asString(raw.source)!.trim() } : {}),
+    };
+  }
+
+  if (raw.type === "prompt_message" || raw.type === "ui_inline") {
+    const anchor =
+      raw.anchor === "depth_from_end" || raw.anchor === "after_last_user"
+        ? raw.anchor
+        : "after_last_user";
+    const base = {
+      type: raw.type,
+      role: normalizePromptRole(raw.role),
+      ...(asString(raw.source)?.trim() ? { source: asString(raw.source)!.trim() } : {}),
+    } as const;
+    if (anchor === "depth_from_end") {
+      return {
+        ...base,
+        anchor,
+        depthFromEnd: normalizeNonNegativeInteger(raw.depthFromEnd),
+      } as ArtifactExposure;
+    }
+    return {
+      ...base,
+      anchor,
+    } as ArtifactExposure;
+  }
+
+  if (raw.type === "turn_rewrite") {
+    return {
+      type: "turn_rewrite",
+      target:
+        raw.target === "assistant_output_main" ? "assistant_output_main" : "current_user_main",
+      mode: "replace",
+    };
+  }
+
+  return null;
+}
+
+function legacyOutputToArtifactConfig(params: {
+  opId: string;
+  kind: OperationKind;
+  title?: string;
+  llmOutputMode?: "text" | "json";
+  output: LegacyOperationOutput;
+}): OperationArtifactConfig {
+  const base = makeDefaultOperationArtifactConfig({
+    opId: params.opId,
+    kind: params.kind,
+    llmOutputMode: params.llmOutputMode,
+    title: params.title,
+  });
+
+  if (params.output.type === "artifacts") {
+    return {
+      ...base,
+      tag: normalizeArtifactTag(params.output.writeArtifact.tag, base.tag),
+      persistence: params.output.writeArtifact.persistence,
+      semantics: params.output.writeArtifact.semantics,
+    };
+  }
+
+  if (params.output.type === "prompt_time") {
+    if (params.output.promptTime.kind === "system_update") {
+      return {
+        ...base,
+        exposures: [
+          {
+            type: "prompt_part",
+            target: "system",
+            mode: params.output.promptTime.mode,
+            ...(params.output.promptTime.source
+              ? { source: params.output.promptTime.source }
+              : {}),
+          },
+        ],
+      };
+    }
+
+    if (params.output.promptTime.kind === "append_after_last_user") {
+      return {
+        ...base,
+        exposures: [
+          {
+            type: "prompt_message",
+            role: params.output.promptTime.role,
+            anchor: "after_last_user",
+            ...(params.output.promptTime.source
+              ? { source: params.output.promptTime.source }
+              : {}),
+          },
+        ],
+      };
+    }
+
+    return {
+      ...base,
+      exposures: [
+        {
+          type: "prompt_message",
+          role: params.output.promptTime.role,
+          anchor: "depth_from_end",
+          depthFromEnd: normalizeNonNegativeInteger(params.output.promptTime.depthFromEnd),
+          ...(params.output.promptTime.source ? { source: params.output.promptTime.source } : {}),
+        },
+      ],
+    };
+  }
+
+  return {
+    ...base,
+    exposures: [
+      {
+        type: "turn_rewrite",
+        target:
+          params.output.canonicalization.target === "assistant"
+            ? "assistant_output_main"
+            : "current_user_main",
+        mode: "replace",
+      },
+    ],
+  };
+}
+
+export function normalizeOperationArtifactConfig(params: {
+  opId: string;
+  kind: OperationKind;
+  title?: string;
+  rawParams: unknown;
+}): OperationArtifactConfig {
+  const llmOutputMode =
+    isRecord(params.rawParams) &&
+    isRecord(params.rawParams.params) &&
+    params.rawParams.params.outputMode === "json"
+      ? "json"
+      : "text";
+  const fallback = makeDefaultOperationArtifactConfig({
+    opId: params.opId,
+    kind: params.kind,
+    llmOutputMode,
+    title: params.title,
+  });
+
+  if (!isRecord(params.rawParams)) {
+    return fallback;
+  }
+
+  if (isRecord(params.rawParams.artifact)) {
+    const artifact = params.rawParams.artifact;
+    const exposures = Array.isArray(artifact.exposures)
+      ? artifact.exposures
+          .map((item) => normalizeExposure(item))
+          .filter((item): item is ArtifactExposure => Boolean(item))
+      : [];
+    const rawArtifactId = asString(artifact.artifactId)?.trim();
+    const rawTag = asString(artifact.tag)?.trim();
+    const migratedLegacyTag = !rawTag && rawArtifactId && !rawArtifactId.startsWith("artifact:") ? rawArtifactId : undefined;
+    return {
+      artifactId:
+        rawArtifactId && !migratedLegacyTag ? rawArtifactId : fallback.artifactId,
+      tag: normalizeArtifactTag(rawTag ?? migratedLegacyTag, fallback.tag),
+      title: asString(artifact.title)?.trim() || fallback.title,
+      description: asString(artifact.description)?.trim() || undefined,
+      format:
+        artifact.format === "text" || artifact.format === "markdown" || artifact.format === "json"
+          ? artifact.format
+          : fallback.format,
+      persistence:
+        artifact.persistence === "persisted" || artifact.persistence === "run_only"
+          ? artifact.persistence
+          : fallback.persistence,
+      writeMode:
+        artifact.writeMode === "append" || artifact.writeMode === "replace"
+          ? artifact.writeMode
+          : fallback.writeMode,
+      history: {
+        enabled: asBoolean(isRecord(artifact.history) ? artifact.history.enabled : undefined) ?? true,
+        maxItems: normalizePositiveInteger(
+          isRecord(artifact.history) ? artifact.history.maxItems : undefined,
+          fallback.history.maxItems
+        ),
+      },
+      semantics: asString(artifact.semantics)?.trim() || undefined,
+      exposures,
+    };
+  }
+
+  if (isRecord(params.rawParams.output) && typeof params.rawParams.output.type === "string") {
+    return legacyOutputToArtifactConfig({
+      opId: params.opId,
+      kind: params.kind,
+      title: params.title,
+      llmOutputMode,
+      output: params.rawParams.output as LegacyOperationOutput,
+    });
+  }
+
+  if (isRecord(params.rawParams.writeArtifact)) {
+    return legacyOutputToArtifactConfig({
+      opId: params.opId,
+      kind: params.kind,
+      title: params.title,
+      llmOutputMode,
+      output: {
+        type: "artifacts",
+        writeArtifact: params.rawParams.writeArtifact as LegacyArtifactWriteTarget,
+      },
+    });
+  }
+
+  return fallback;
+}
diff --git a/web/src/api/instructions.ts b/web/src/api/instructions.ts
index 77e650bd..a503cf57 100644
--- a/web/src/api/instructions.ts
+++ b/web/src/api/instructions.ts
@@ -1,18 +1,33 @@
 import { apiJson } from './api-json';
 
-import type { InstructionMeta } from '@shared/types/instructions';
+import type {
+	InstructionKind,
+	InstructionMeta,
+	StBaseConfig,
+} from '@shared/types/instructions';
 
-export type InstructionDto = {
+type InstructionDtoBase = {
 	id: string;
 	ownerId: string;
 	name: string;
 	engine: 'liquidjs';
-	templateText: string;
 	meta: InstructionMeta | null;
 	createdAt: string;
 	updatedAt: string;
 };
 
+export type BasicInstructionDto = InstructionDtoBase & {
+	kind: 'basic';
+	templateText: string;
+};
+
+export type StBaseInstructionDto = InstructionDtoBase & {
+	kind: 'st_base';
+	stBase: StBaseConfig;
+};
+
+export type InstructionDto = BasicInstructionDto | StBaseInstructionDto;
+
 export async function listInstructions(params?: { ownerId?: string }): Promise<InstructionDto[]> {
 	const query = new URLSearchParams();
 	if (typeof params?.ownerId === 'string') query.set('ownerId', params.ownerId);
@@ -23,19 +38,18 @@ export async function listInstructions(params?: { ownerId?: string }): Promise<I
 export async function createInstruction(params: {
 	name: string;
 	engine?: 'liquidjs';
-	templateText: string;
-	meta?: InstructionMeta;
 	ownerId?: string;
-}): Promise<InstructionDto> {
+	meta?: InstructionMeta;
+} & ({
+	kind: 'basic';
+	templateText: string;
+} | {
+	kind: 'st_base';
+	stBase: StBaseConfig;
+})): Promise<InstructionDto> {
 	return apiJson<InstructionDto>('/instructions', {
 		method: 'POST',
-		body: JSON.stringify({
-			ownerId: params.ownerId,
-			name: params.name,
-			engine: params.engine ?? 'liquidjs',
-			templateText: params.templateText,
-			meta: params.meta,
-		}),
+		body: JSON.stringify(params),
 	});
 }
 
@@ -43,20 +57,39 @@ export async function updateInstruction(params: {
 	id: string;
 	name?: string;
 	engine?: 'liquidjs';
-	templateText?: string;
 	meta?: InstructionMeta;
-}): Promise<InstructionDto> {
-	return apiJson<InstructionDto>(`/instructions/${encodeURIComponent(params.id)}`, {
+} & ({
+	kind: 'basic';
+	templateText?: string;
+} | {
+	kind: 'st_base';
+	stBase?: StBaseConfig;
+})): Promise<InstructionDto> {
+	const { id, ...body } = params;
+	return apiJson<InstructionDto>(`/instructions/${encodeURIComponent(id)}`, {
 		method: 'PUT',
-		body: JSON.stringify({
-			name: params.name,
-			engine: params.engine,
-			templateText: params.templateText,
-			meta: params.meta,
-		}),
+		body: JSON.stringify(body),
 	});
 }
 
+export type CreateInstructionDraft =
+	| {
+			kind: 'basic';
+			name: string;
+			templateText: string;
+			meta?: InstructionMeta;
+	  }
+	| {
+			kind: 'st_base';
+			name: string;
+			stBase: StBaseConfig;
+			meta?: InstructionMeta;
+	  };
+
+export function getInstructionKindLabel(kind: InstructionKind): string {
+	return kind === 'st_base' ? 'st-base' : 'basic';
+}
+
 export async function deleteInstruction(id: string): Promise<{ id: string }> {
 	return apiJson<{ id: string }>(`/instructions/${encodeURIComponent(id)}`, { method: 'DELETE' });
 }
diff --git a/web/src/features/sidebars/instructions/index.tsx b/web/src/features/sidebars/instructions/index.tsx
index 9dcaff63..0f5b6821 100644
--- a/web/src/features/sidebars/instructions/index.tsx
+++ b/web/src/features/sidebars/instructions/index.tsx
@@ -1,13 +1,13 @@
-import { Button, Group, Modal, Select, Stack, Text, TextInput } from '@mantine/core';
+import { Badge, Button, Group, Modal, Select, Stack, Text, TextInput } from '@mantine/core';
 import { useUnit } from 'effector-react';
-import { useMemo, useRef, useState } from 'react';
+import { type ChangeEvent, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
 	LuDownload,
-	LuFilePlus2,
 	LuLink2,
 	LuLink2Off,
 	LuPencil,
+	LuPlus,
 	LuSave,
 	LuTrash2,
 	LuUpload,
@@ -25,13 +25,11 @@ import {
 	updateInstructionFx,
 } from '@model/instructions';
 import {
-	buildStPresetFromAdvanced,
+	buildStPresetFromStBase,
 	createBestEffortLlmBindingPlan,
-	createStAdvancedConfigFromPreset,
-	createTsInstructionMeta,
+	createDefaultStBaseConfig,
+	createStBaseConfigFromPreset,
 	detectStChatCompletionPreset,
-	deriveInstructionTemplateText,
-	getTsInstructionMeta,
 	hasSensitivePresetFields,
 } from '@model/instructions/st-preset';
 import { Drawer } from '@ui/drawer';
@@ -40,8 +38,8 @@ import { toaster } from '@ui/toaster';
 
 import { InstructionEditor } from './instruction-editor';
 
-import type { InstructionDto } from '../../../api/instructions';
-import type { InstructionMeta } from '@shared/types/instructions';
+import type { CreateInstructionDraft, InstructionDto } from '../../../api/instructions';
+import type { InstructionMeta, StBaseConfig } from '@shared/types/instructions';
 
 type NameDialogMode = 'rename' | 'saveAs';
 
@@ -57,6 +55,20 @@ type PendingSensitiveImport = {
 	json: Record<string, unknown>;
 };
 
+type InstructionViewState =
+	| {
+			kind: 'basic';
+			name: string;
+			templateText: string;
+			meta?: InstructionMeta;
+	  }
+	| {
+			kind: 'st_base';
+			name: string;
+			stBase: StBaseConfig;
+			meta?: InstructionMeta;
+	  };
+
 function downloadJson(params: { fileName: string; data: unknown }): void {
 	const blob = new Blob([JSON.stringify(params.data, null, 2)], { type: 'application/json' });
 	const url = URL.createObjectURL(blob);
@@ -79,18 +91,6 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
-function createInstructionPayloadFromDraft(params: {
-	name: string;
-	templateText: string;
-	meta?: InstructionMeta;
-}) {
-	return {
-		name: params.name.trim(),
-		templateText: params.templateText,
-		meta: params.meta,
-	};
-}
-
 function resolveCopyName(originalName: string, usedNames: Set<string>): string {
 	const firstCopy = `${originalName} (copy)`;
 	if (!usedNames.has(firstCopy)) return firstCopy;
@@ -107,17 +107,70 @@ function resolveUniqueName(name: string, usedNames: Set<string>): string {
 	return resolveCopyName(trimmed, usedNames);
 }
 
+function toInstructionViewState(instruction: InstructionDto): InstructionViewState {
+	if (instruction.kind === 'st_base') {
+		return {
+			kind: 'st_base',
+			name: instruction.name,
+			stBase: instruction.stBase,
+			meta: instruction.meta ?? undefined,
+		};
+	}
+
+	return {
+		kind: 'basic',
+		name: instruction.name,
+		templateText: instruction.templateText,
+		meta: instruction.meta ?? undefined,
+	};
+}
+
 function areInstructionValuesEqual(
 	selectedInstruction: InstructionDto | null,
-	draft: { sourceInstructionId: string; name: string; templateText: string; meta?: InstructionMeta } | null,
+	draft:
+		| ({
+				sourceInstructionId: string;
+		  } & InstructionViewState)
+		| null,
 ): boolean {
 	if (!selectedInstruction || !draft) return true;
 	if (draft.sourceInstructionId !== selectedInstruction.id) return false;
-	return (
-		draft.name === selectedInstruction.name &&
-		draft.templateText === selectedInstruction.templateText &&
-		JSON.stringify(draft.meta ?? null) === JSON.stringify(selectedInstruction.meta ?? null)
-	);
+	if (draft.kind !== selectedInstruction.kind) return false;
+	if (draft.name !== selectedInstruction.name) return false;
+	if (JSON.stringify(draft.meta ?? null) !== JSON.stringify(selectedInstruction.meta ?? null)) return false;
+
+	if (draft.kind === 'basic' && selectedInstruction.kind === 'basic') {
+		return draft.templateText === selectedInstruction.templateText;
+	}
+
+	if (draft.kind === 'st_base' && selectedInstruction.kind === 'st_base') {
+		return JSON.stringify(draft.stBase) === JSON.stringify(selectedInstruction.stBase);
+	}
+
+	return false;
+}
+
+function createInstructionPayloadFromState(params: InstructionViewState): CreateInstructionDraft {
+	if (params.kind === 'st_base') {
+		return {
+			kind: 'st_base',
+			name: params.name.trim(),
+			stBase: params.stBase,
+			meta: params.meta,
+		};
+	}
+
+	return {
+		kind: 'basic',
+		name: params.name.trim(),
+		templateText: params.templateText,
+		meta: params.meta,
+	};
+}
+
+function createInstructionLabel(item: InstructionDto, t: (key: string) => string): string {
+	const kindLabel = item.kind === 'st_base' ? t('instructions.kinds.stBase') : t('instructions.kinds.basic');
+	return `${item.name} · ${kindLabel}`;
 }
 
 export const InstructionsSidebar = () => {
@@ -133,6 +186,7 @@ export const InstructionsSidebar = () => {
 		deleteInstructionFx,
 	]);
 
+	const [createOpened, setCreateOpened] = useState(false);
 	const [nameDialog, setNameDialog] = useState<NameDialogState | null>(null);
 	const [deleteOpened, setDeleteOpened] = useState(false);
 	const [discardOpened, setDiscardOpened] = useState(false);
@@ -144,11 +198,20 @@ export const InstructionsSidebar = () => {
 	const usedNames = useMemo(() => new Set(items.map((item) => item.name)), [items]);
 	const options = items
 		.filter((item) => typeof item.id === 'string' && item.id.trim().length > 0)
-		.map((item) => ({ value: item.id, label: item.name || item.id }));
+		.map((item) => ({ value: item.id, label: createInstructionLabel(item, t) }));
 
-	const currentValues = useMemo(() => {
+	const currentValues = useMemo<InstructionViewState | null>(() => {
 		if (draft && selectedInstruction && draft.sourceInstructionId === selectedInstruction.id) {
+			if (draft.kind === 'st_base') {
+				return {
+					kind: 'st_base',
+					name: draft.name,
+					stBase: draft.stBase,
+					meta: draft.meta,
+				};
+			}
 			return {
+				kind: 'basic',
 				name: draft.name,
 				templateText: draft.templateText,
 				meta: draft.meta,
@@ -156,11 +219,7 @@ export const InstructionsSidebar = () => {
 		}
 
 		if (selectedInstruction) {
-			return {
-				name: selectedInstruction.name,
-				templateText: selectedInstruction.templateText,
-				meta: selectedInstruction.meta ?? undefined,
-			};
+			return toInstructionViewState(selectedInstruction);
 		}
 
 		return null;
@@ -171,18 +230,11 @@ export const InstructionsSidebar = () => {
 		[selectedInstruction, draft],
 	);
 
-	const selectedTsInstruction = getTsInstructionMeta(currentValues?.meta);
-	const selectedStAdvanced =
-		selectedTsInstruction?.mode === 'st_advanced' ? selectedTsInstruction.stAdvanced : null;
-
 	const applyBestEffortBinding = async (instruction: InstructionDto) => {
 		if (!appSettings.bindChatCompletionPresetToConnection) return;
+		if (instruction.kind !== 'st_base') return;
 
-		const tsInstruction = getTsInstructionMeta(instruction.meta);
-		const stAdvanced = tsInstruction?.mode === 'st_advanced' ? tsInstruction.stAdvanced : null;
-		if (!stAdvanced) return;
-
-		const plan = createBestEffortLlmBindingPlan(stAdvanced);
+		const plan = createBestEffortLlmBindingPlan(instruction.stBase);
 		try {
 			if (plan.runtimePatch?.activeProviderId || typeof plan.runtimePatch?.activeModel !== 'undefined') {
 				const currentRuntime = await getRuntime({ scope: 'global', scopeId: 'global' });
@@ -230,16 +282,6 @@ export const InstructionsSidebar = () => {
 		});
 	};
 
-	const promptForSaveAs = () => {
-		const fallbackName = currentValues?.name?.trim() ? `${currentValues.name} copy` : t('instructions.defaults.newPreset');
-		setNameDialog({
-			mode: 'saveAs',
-			value: fallbackName,
-			title: t('instructions.dialogs.saveAsTitle'),
-			submitLabel: t('instructions.actions.saveAs'),
-		});
-	};
-
 	const handleNameDialogSubmit = async () => {
 		if (!nameDialog || !currentValues || !selectedInstruction) return;
 		const nextName = nameDialog.value.trim();
@@ -249,25 +291,17 @@ export const InstructionsSidebar = () => {
 				? nextName
 				: resolveUniqueName(nextName, usedNames);
 
+		const nextState: InstructionViewState = { ...currentValues, name: resolvedName } as InstructionViewState;
+
 		try {
 			if (nameDialog.mode === 'rename') {
 				await onUpdateInstruction({
 					id: selectedInstruction.id,
-					...createInstructionPayloadFromDraft({
-						name: resolvedName,
-						templateText: currentValues.templateText,
-						meta: currentValues.meta,
-					}),
+					...createInstructionPayloadFromState(nextState),
 				});
 				toaster.success({ title: t('instructions.toasts.savedTitle'), description: resolvedName });
 			} else {
-				const created = await onCreateInstruction(
-					createInstructionPayloadFromDraft({
-						name: resolvedName,
-						templateText: currentValues.templateText,
-						meta: currentValues.meta,
-					}),
-				);
+				const created = await onCreateInstruction(createInstructionPayloadFromState(nextState));
 				await applyBestEffortBinding(created);
 				toaster.success({ title: t('instructions.toasts.createdTitle'), description: created.name });
 			}
@@ -282,7 +316,7 @@ export const InstructionsSidebar = () => {
 		try {
 			await onUpdateInstruction({
 				id: selectedInstruction.id,
-				...createInstructionPayloadFromDraft(currentValues),
+				...createInstructionPayloadFromState(currentValues),
 			});
 			toaster.success({ title: t('instructions.toasts.savedTitle'), description: currentValues.name });
 		} catch {
@@ -300,43 +334,54 @@ export const InstructionsSidebar = () => {
 		}
 	};
 
-	const handleExport = () => {
-		if (!currentValues) {
-			toaster.error({ title: t('instructions.toasts.exportNotPossibleTitle'), description: t('instructions.toasts.selectForExport') });
-			return;
+	const handleCreate = async (kind: 'basic' | 'st_base') => {
+		try {
+			const created = await onCreateInstruction(
+				kind === 'st_base'
+					? {
+							kind: 'st_base',
+							name: resolveUniqueName(t('instructions.defaults.newStBaseInstruction'), usedNames),
+							stBase: createDefaultStBaseConfig(),
+					  }
+					: {
+							kind: 'basic',
+							name: resolveUniqueName(t('instructions.defaults.newInstruction'), usedNames),
+							templateText: '{{char.name}}',
+					  }
+			);
+			await applyBestEffortBinding(created);
+			setCreateOpened(false);
+			toaster.success({ title: t('instructions.toasts.createdTitle'), description: created.name });
+		} catch {
+			// handled by model watcher
 		}
+	};
 
-		const tsInstruction = getTsInstructionMeta(currentValues.meta);
-		const stAdvanced = tsInstruction?.mode === 'st_advanced' ? tsInstruction.stAdvanced : null;
-		if (!stAdvanced) {
+	const handleExport = () => {
+		if (!currentValues || currentValues.kind !== 'st_base') {
 			toaster.error({ title: t('instructions.toasts.exportNotPossibleTitle'), description: t('instructions.toasts.stPresetOnlyExport') });
 			return;
 		}
 
 		downloadJson({
 			fileName: `${currentValues.name}.json`,
-			data: buildStPresetFromAdvanced(stAdvanced),
+			data: buildStPresetFromStBase(currentValues.stBase),
 		});
 	};
 
 	const importStPreset = (fileName: string, json: Record<string, unknown>, sensitiveImportMode: 'remove' | 'keep') => {
-		const stAdvanced = createStAdvancedConfigFromPreset({
+		const stBase = createStBaseConfigFromPreset({
 			preset: json,
 			fileName,
 			sensitiveImportMode,
 		});
-		const templateText = deriveInstructionTemplateText(stAdvanced);
 		void onCreateInstruction({
+			kind: 'st_base',
 			name: resolveUniqueName(
 				getBasename(fileName).trim() || t('instructions.defaults.importedInstruction'),
 				usedNames,
 			),
-			templateText,
-			meta: createTsInstructionMeta({
-				meta: null,
-				mode: 'st_advanced',
-				stAdvanced,
-			}),
+			stBase,
 		})
 			.then((created) => {
 				void applyBestEffortBinding(created);
@@ -347,7 +392,7 @@ export const InstructionsSidebar = () => {
 			});
 	};
 
-	const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+	const handleFileChange = (event: ChangeEvent<HTMLInputElement>) => {
 		const file = event.target.files?.[0];
 		if (!file) return;
 
@@ -360,22 +405,48 @@ export const InstructionsSidebar = () => {
 				if (
 					isRecord(json) &&
 					json.type === 'talespinner.instruction' &&
-					isRecord(json.instruction)
+					isRecord(json.instruction) &&
+					(json.instruction.kind === 'basic' || json.instruction.kind === 'st_base')
 				) {
 					const name = typeof json.instruction.name === 'string' ? json.instruction.name : t('instructions.defaults.importedInstruction');
-					const templateText = typeof json.instruction.templateText === 'string' ? json.instruction.templateText : '';
 					const meta = isRecord(json.instruction.meta) ? (json.instruction.meta as InstructionMeta) : undefined;
 
-					if (!templateText.trim()) {
+					if (json.instruction.kind === 'basic') {
+						const templateText = typeof json.instruction.templateText === 'string' ? json.instruction.templateText : '';
+						if (!templateText.trim()) {
+							toaster.error({
+								title: t('instructions.toasts.importErrorTitle'),
+								description: t('instructions.toasts.importMissingTemplateText'),
+							});
+							return;
+						}
+
+						void onCreateInstruction({ kind: 'basic', name, templateText, meta })
+							.then((created) => toaster.success({ title: t('instructions.toasts.importSuccessTitle'), description: created.name }))
+							.catch(() => {
+								// handled by model watcher
+							});
+						return;
+					}
+
+					if (!isRecord(json.instruction.stBase)) {
 						toaster.error({
 							title: t('instructions.toasts.importErrorTitle'),
-							description: t('instructions.toasts.importMissingTemplateText'),
+							description: t('instructions.toasts.importMissingStBase'),
 						});
 						return;
 					}
 
-					void onCreateInstruction({ name, templateText, meta })
-						.then((created) => toaster.success({ title: t('instructions.toasts.importSuccessTitle'), description: created.name }))
+					void onCreateInstruction({
+						kind: 'st_base',
+						name,
+						stBase: json.instruction.stBase as StBaseConfig,
+						meta,
+					})
+						.then((created) => {
+							void applyBestEffortBinding(created);
+							toaster.success({ title: t('instructions.toasts.importSuccessTitle'), description: created.name });
+						})
 						.catch(() => {
 							// handled by model watcher
 						});
@@ -413,6 +484,13 @@ export const InstructionsSidebar = () => {
 			<Stack gap="md">
 				<input type="file" ref={fileInputRef} style={{ display: 'none' }} accept=".json,.settings" onChange={handleFileChange} />
 
+				<Modal opened={createOpened} onClose={() => setCreateOpened(false)} title={t('instructions.dialogs.createTitle')} centered>
+					<Stack gap="md">
+						<Button onClick={() => void handleCreate('basic')}>{t('instructions.actions.createBasic')}</Button>
+						<Button variant="light" onClick={() => void handleCreate('st_base')}>{t('instructions.actions.createStBase')}</Button>
+					</Stack>
+				</Modal>
+
 				<Modal
 					opened={nameDialog !== null}
 					onClose={() => setNameDialog(null)}
@@ -529,6 +607,12 @@ export const InstructionsSidebar = () => {
 					<Group justify="space-between" wrap="nowrap">
 						<Text fw={700}>{t('instructions.presets.title')}</Text>
 						<Group gap="xs" wrap="nowrap">
+							<IconButtonWithTooltip
+								tooltip={t('instructions.actions.create')}
+								icon={<LuPlus size={16} />}
+								aria-label={t('instructions.actions.create')}
+								onClick={() => setCreateOpened(true)}
+							/>
 							<IconButtonWithTooltip
 								tooltip={
 									appSettings.bindChatCompletionPresetToConnection
@@ -560,7 +644,7 @@ export const InstructionsSidebar = () => {
 								tooltip={t('instructions.presets.actions.export')}
 								icon={<LuDownload size={16} />}
 								aria-label={t('instructions.presets.actions.export')}
-								disabled={!selectedStAdvanced}
+								disabled={currentValues?.kind !== 'st_base'}
 								onClick={handleExport}
 							/>
 							<IconButtonWithTooltip
@@ -594,6 +678,12 @@ export const InstructionsSidebar = () => {
 							style={{ flex: 1 }}
 						/>
 
+						{selectedInstruction && (
+							<Badge variant="light">
+								{selectedInstruction.kind === 'st_base' ? t('instructions.kinds.stBase') : t('instructions.kinds.basic')}
+							</Badge>
+						)}
+
 						<Group gap="xs" wrap="nowrap">
 							<IconButtonWithTooltip
 								tooltip={t('instructions.actions.updateCurrent')}
@@ -610,13 +700,6 @@ export const InstructionsSidebar = () => {
 								disabled={!selectedInstruction}
 								onClick={promptForRename}
 							/>
-							<IconButtonWithTooltip
-								tooltip={t('instructions.actions.saveAs')}
-								icon={<LuFilePlus2 size={16} />}
-								aria-label={t('instructions.actions.saveAs')}
-								disabled={!currentValues}
-								onClick={promptForSaveAs}
-							/>
 						</Group>
 					</Group>
 				</Stack>
diff --git a/web/src/features/sidebars/instructions/instruction-editor.tsx b/web/src/features/sidebars/instructions/instruction-editor.tsx
index 6745fc9b..5c0b15f1 100644
--- a/web/src/features/sidebars/instructions/instruction-editor.tsx
+++ b/web/src/features/sidebars/instructions/instruction-editor.tsx
@@ -1,7 +1,6 @@
 import { Accordion, Alert, Badge, Button, Collapse, Group, NumberInput, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
 import { useUnit } from 'effector-react';
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { LuArrowDown, LuArrowUp, LuChevronDown, LuChevronRight, LuPlus, LuTrash2 } from 'react-icons/lu';
 
@@ -11,10 +10,9 @@ import {
 	instructionEditorDraftChanged,
 } from '@model/instructions';
 import {
-	createTsInstructionMeta,
+	createDefaultStBaseConfig,
 	getStPromptDefinition,
 	getStPromptSourceLabel,
-	getTsInstructionMeta,
 	isSystemMarkerPrompt,
 	resolvePreferredPromptOrder,
 } from '@model/instructions/st-preset';
@@ -22,12 +20,7 @@ import { LiquidDocsButton } from '@ui/liquid-template-docs';
 
 import { prerenderInstruction } from '../../../api/instructions';
 
-import type { StAdvancedConfig, StPrompt } from '@shared/types/instructions';
-
-type FormValues = {
-	name: string;
-	templateText: string;
-};
+import type { StBaseConfig, StBasePrompt } from '@shared/types/instructions';
 
 const KNOWN_PROMPT_IDENTIFIERS = [
 	'main',
@@ -44,37 +37,7 @@ const KNOWN_PROMPT_IDENTIFIERS = [
 	'enhanceDefinitions',
 ];
 
-function createDefaultAdvancedConfig(templateText: string): StAdvancedConfig {
-	return {
-		rawPreset: {},
-		prompts: [
-			{
-				identifier: 'main',
-				name: 'Main Prompt',
-				role: 'system',
-				system_prompt: true,
-				content: templateText.trim().length > 0 ? templateText : '{{char.name}}',
-			},
-		],
-		promptOrder: [
-			{
-				character_id: 100001,
-				order: [
-					{ identifier: 'main', enabled: true },
-					{ identifier: 'chatHistory', enabled: true },
-				],
-			},
-		],
-		responseConfig: {},
-		importInfo: {
-			source: 'sillytavern',
-			fileName: 'manual',
-			importedAt: new Date().toISOString(),
-		},
-	};
-}
-
-function normalizePromptForEdit(prompt: StPrompt | undefined, identifier: string): StPrompt {
+function normalizePromptForEdit(prompt: StBasePrompt | undefined, identifier: string): StBasePrompt {
 	if (prompt) return { ...prompt };
 	const definition = getStPromptDefinition(identifier);
 	if (definition) return { ...definition };
@@ -89,84 +52,84 @@ function normalizePromptForEdit(prompt: StPrompt | undefined, identifier: string
 
 export const InstructionEditor = () => {
 	const { t } = useTranslation();
-	const tpl = useUnit($selectedInstruction);
+	const instruction = useUnit($selectedInstruction);
 	const [chat, branchId, profile] = useUnit([$currentChat, $currentBranchId, $currentEntityProfile]);
-	const [isAdvancedMode, setIsAdvancedMode] = useState(false);
-	const [stAdvanced, setStAdvanced] = useState<StAdvancedConfig | null>(null);
+
+	const [basicTemplateText, setBasicTemplateText] = useState('');
+	const [stBase, setStBase] = useState<StBaseConfig | null>(null);
 	const [newPromptIdentifier, setNewPromptIdentifier] = useState<string | null>(null);
 	const [collapsedPromptById, setCollapsedPromptById] = useState<Record<string, boolean>>({});
 
-	const [preview, setPreview] = useState<string>('');
+	const [preview, setPreview] = useState('');
 	const [previewError, setPreviewError] = useState<string | null>(null);
 	const [previewLoading, setPreviewLoading] = useState(false);
 
-	const methods = useForm<FormValues>({
-		defaultValues: {
-			name: tpl?.name ?? '',
-			templateText: tpl?.templateText ?? '',
-		},
-	});
-	const { reset } = methods;
-	const watchedName = methods.watch('name');
-	const watchedTemplateText = methods.watch('templateText');
 	const lastResetInstructionIdRef = useRef<string | null>(null);
 
 	useEffect(() => {
-		const nextInstructionId = tpl?.id ?? null;
+		const nextInstruction = instruction;
+		const nextInstructionId = nextInstruction?.id ?? null;
 		if (nextInstructionId === null) {
 			lastResetInstructionIdRef.current = null;
+			setBasicTemplateText('');
+			setStBase(null);
 			return;
 		}
+		if (!nextInstruction) return;
 		if (lastResetInstructionIdRef.current === nextInstructionId) return;
 		lastResetInstructionIdRef.current = nextInstructionId;
 
-		const tsInstruction = getTsInstructionMeta(tpl?.meta);
-		const mode = tsInstruction?.mode ?? 'basic';
-		const advancedConfig =
-			tsInstruction?.stAdvanced ?? createDefaultAdvancedConfig(tpl?.templateText ?? '');
-
-		reset({
-			name: tpl?.name ?? '',
-			templateText: tpl?.templateText ?? '',
-		});
-		setIsAdvancedMode(mode === 'st_advanced');
-		setStAdvanced(advancedConfig);
+		if (nextInstruction.kind === 'basic') {
+			setBasicTemplateText(nextInstruction.templateText);
+			setStBase(null);
+		} else {
+			setBasicTemplateText('');
+			setStBase(structuredClone(nextInstruction.stBase));
+		}
 		setNewPromptIdentifier(null);
 		setCollapsedPromptById({});
 		setPreview('');
 		setPreviewError(null);
-	}, [reset, tpl?.id, tpl?.meta, tpl?.name, tpl?.templateText]);
+	}, [instruction]);
 
 	useEffect(() => {
-		if (!tpl) {
+		if (!instruction) {
 			instructionEditorDraftChanged(null);
 			return;
 		}
-		const ensuredAdvanced = stAdvanced ?? createDefaultAdvancedConfig(watchedTemplateText);
+
+		if (instruction.kind === 'basic') {
+			instructionEditorDraftChanged({
+				sourceInstructionId: instruction.id,
+				kind: 'basic',
+				name: instruction.name,
+				templateText: basicTemplateText,
+				meta: instruction.meta ?? undefined,
+			});
+			return;
+		}
+
 		instructionEditorDraftChanged({
-			sourceInstructionId: tpl.id,
-			name: watchedName,
-			templateText: watchedTemplateText,
-			meta: createTsInstructionMeta({
-				meta: tpl.meta,
-				mode: isAdvancedMode ? 'st_advanced' : 'basic',
-				stAdvanced: ensuredAdvanced,
-			}),
+			sourceInstructionId: instruction.id,
+			kind: 'st_base',
+			name: instruction.name,
+			stBase: stBase ?? createDefaultStBaseConfig(),
+			meta: instruction.meta ?? undefined,
 		});
-	}, [isAdvancedMode, stAdvanced, tpl, watchedName, watchedTemplateText]);
+	}, [basicTemplateText, instruction, stBase]);
 
 	const preferredOrder = useMemo(() => {
-		if (!stAdvanced) return null;
-		return resolvePreferredPromptOrder(stAdvanced);
-	}, [stAdvanced]);
+		if (!stBase) return null;
+		return resolvePreferredPromptOrder(stBase);
+	}, [stBase]);
 
 	const promptMap = useMemo(() => {
-		const map = new Map<string, StPrompt>();
-		for (const prompt of stAdvanced?.prompts ?? []) {
+		const map = new Map<string, StBasePrompt>();
+		for (const prompt of stBase?.prompts ?? []) {
 			map.set(prompt.identifier, prompt);
 		}
 		return map;
-	}, [stAdvanced]);
+	}, [stBase]);
 
 	const addablePromptIdentifiers = useMemo(() => {
 		const used = new Set(preferredOrder?.order.map((item) => item.identifier) ?? []);
@@ -174,15 +137,15 @@ export const InstructionEditor = () => {
 	}, [preferredOrder?.order]);
 
 	const rawPresetJson = useMemo(() => {
-		if (!stAdvanced) return '';
+		if (!stBase) return '';
 		try {
-			return JSON.stringify(stAdvanced.rawPreset ?? {}, null, 2);
+			return JSON.stringify(stBase.rawPreset ?? {}, null, 2);
 		} catch {
 			return '{}';
 		}
-	}, [stAdvanced]);
+	}, [stBase]);
 
-	if (!tpl) return null;
+	if (!instruction) return null;
 
 	const isPromptCollapsed = (identifier: string, isMarkerPrompt: boolean): boolean => {
 		const value = collapsedPromptById[identifier];
@@ -198,7 +161,7 @@ export const InstructionEditor = () => {
 	};
 
 	const updatePreferredOrder = (updater: (order: Array<{ identifier: string; enabled: boolean }>) => Array<{ identifier: string; enabled: boolean }>) => {
-		setStAdvanced((current) => {
+		setStBase((current) => {
 			if (!current) return current;
 			const selectedOrder = resolvePreferredPromptOrder(current);
 			const nextOrder = updater(selectedOrder.order.map((item) => ({ ...item })));
@@ -223,7 +186,7 @@ export const InstructionEditor = () => {
 	};
 
 	const setPromptContent = (identifier: string, content: string) => {
-		setStAdvanced((current) => {
+		setStBase((current) => {
 			if (!current) return current;
 			const index = current.prompts.findIndex((item) => item.identifier === identifier);
 			if (index >= 0) {
@@ -265,7 +228,7 @@ export const InstructionEditor = () => {
 			| 'n',
 		value: string | number
 	) => {
-		setStAdvanced((current) => {
+		setStBase((current) => {
 			if (!current) return current;
 			const responseConfig = { ...current.responseConfig };
 			if (typeof value === 'number' && Number.isFinite(value)) {
@@ -281,7 +244,7 @@ export const InstructionEditor = () => {
 		key: 'reasoning_effort' | 'verbosity',
 		value: string | null
 	) => {
-		setStAdvanced((current) => {
+		setStBase((current) => {
 			if (!current) return current;
 			const responseConfig = { ...current.responseConfig };
 			if (typeof value === 'string' && value.trim().length > 0) {
@@ -297,7 +260,7 @@ export const InstructionEditor = () => {
 		key: 'enable_web_search' | 'stream_openai',
 		value: boolean
 	) => {
-		setStAdvanced((current) => {
+		setStBase((current) => {
 			if (!current) return current;
 			return {
 				...current,
@@ -314,7 +277,7 @@ export const InstructionEditor = () => {
 		setPreviewError(null);
 		try {
 			const data = await prerenderInstruction({
-				templateText: methods.getValues('templateText'),
+				templateText: basicTemplateText,
 				chatId: chat?.id ?? undefined,
 				branchId: branchId ?? undefined,
 				entityProfileId: profile?.id ?? undefined,
@@ -330,380 +293,367 @@ export const InstructionEditor = () => {
 	};
 
 	return (
-		<FormProvider {...methods}>
-			<Stack gap="md" mt="md">
-				<Switch
-					label={t('instructions.fields.advancedMode')}
-					checked={isAdvancedMode}
-					onChange={(event) => setIsAdvancedMode(event.currentTarget.checked)}
-				/>
-
-				{!isAdvancedMode && (
-					<>
-						<Textarea
-							label={
-								<Group gap={6} wrap="nowrap" align="center">
-									{t('instructions.fields.templateText')}
-									<LiquidDocsButton context="instruction" />
-								</Group>
-							}
-							description={t('instructions.fields.templateTextDescription')}
-							value={watchedTemplateText}
-							onChange={(e) => methods.setValue('templateText', e.currentTarget.value, { shouldDirty: true })}
-							minRows={14}
-							autosize
-							styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
-						/>
-
-						{previewError && (
-							<Text c="red" size="sm">
-								{previewError}
-							</Text>
-						)}
-
-						{preview.length > 0 && (
-							<Textarea
-								label={t('instructions.fields.prerender')}
-								description={t('instructions.fields.prerenderDescription')}
-								value={preview}
-								readOnly
-								minRows={10}
-								autosize
-								styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
-							/>
-						)}
-					</>
-				)}
+		<Stack gap="md" mt="md">
+			<Group justify="space-between" align="center">
+				<Text fw={600}>{instruction.name}</Text>
+				<Badge variant="light">
+					{instruction.kind === 'st_base' ? t('instructions.kinds.stBase') : t('instructions.kinds.basic')}
+				</Badge>
+			</Group>
+
+			{instruction.kind === 'basic' && (
+				<>
+					<Textarea
+						label={
+							<Group gap={6} wrap="nowrap" align="center">
+								{t('instructions.fields.templateText')}
+								<LiquidDocsButton context="instruction" />
+							</Group>
+						}
+						description={t('instructions.fields.templateTextDescription')}
+						value={basicTemplateText}
+						onChange={(e) => setBasicTemplateText(e.currentTarget.value)}
+						minRows={14}
+						autosize
+						styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
+					/>
+
+					{previewError && (
+						<Text c="red" size="sm">
+							{previewError}
+						</Text>
+					)}
 
-				{isAdvancedMode && stAdvanced && preferredOrder && (
-					<Stack gap="sm">
-						<Text fw={600}>{t('instructions.fields.fallbackTemplateText')}</Text>
+					{preview.length > 0 && (
 						<Textarea
-							description={t('instructions.fields.fallbackTemplateTextDescription')}
-							value={watchedTemplateText}
-							onChange={(e) => methods.setValue('templateText', e.currentTarget.value, { shouldDirty: true })}
-							minRows={5}
+							label={t('instructions.fields.prerender')}
+							description={t('instructions.fields.prerenderDescription')}
+							value={preview}
+							readOnly
+							minRows={10}
 							autosize
 							styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
 						/>
+					)}
 
-						<Group justify="space-between" align="center">
-							<Text fw={600}>{t('instructions.fields.promptBlocks')}</Text>
-							<Group gap="xs">
-								<Select
-									placeholder={t('instructions.placeholders.addPromptBlock')}
-									data={addablePromptIdentifiers.map((identifier) => ({
-										value: identifier,
-										label: identifier,
-									}))}
-									value={newPromptIdentifier}
-									onChange={setNewPromptIdentifier}
-									clearable
-									w={220}
-								/>
-								<Button
-									size="xs"
-									variant="light"
-									leftSection={<LuPlus size={14} />}
-									disabled={!newPromptIdentifier}
-									onClick={() => {
-										if (!newPromptIdentifier) return;
-										updatePreferredOrder((order) => [
-											...order,
-											{ identifier: newPromptIdentifier, enabled: true },
-										]);
-										setStAdvanced((current) => {
-											if (!current) return current;
-											if (current.prompts.some((item) => item.identifier === newPromptIdentifier)) {
-												return current;
-											}
-											const definition = getStPromptDefinition(newPromptIdentifier);
-											return {
-												...current,
-												prompts: [
-													...current.prompts,
-													definition ?? {
-														identifier: newPromptIdentifier,
-														name: newPromptIdentifier,
-														role: 'system',
-														system_prompt: true,
-														content: '',
-													},
-												],
-											};
-										});
-										setNewPromptIdentifier(null);
-									}}
-								>
-									{t('common.add')}
-								</Button>
-							</Group>
-						</Group>
-
-						{preferredOrder.order.map((entry, index) => {
-							const prompt = normalizePromptForEdit(promptMap.get(entry.identifier), entry.identifier);
-							const unsupported = !KNOWN_PROMPT_IDENTIFIERS.includes(entry.identifier);
-							const isMarkerPrompt = isSystemMarkerPrompt(prompt);
-							const sourceLabel = getStPromptSourceLabel(entry.identifier);
-							const isCollapsed = isPromptCollapsed(entry.identifier, isMarkerPrompt);
-
-							return (
-								<Stack key={`${entry.identifier}_${index}`} gap={6} p="xs" style={{ border: '1px solid var(--mantine-color-gray-3)', borderRadius: 8 }}>
-									<Group justify="space-between" align="center">
-										<Group gap="xs" align="center">
-											<Button
-												size="compact-sm"
-												variant="subtle"
-												px={4}
-												onClick={() => togglePromptCollapsed(entry.identifier, isMarkerPrompt)}
-												aria-label={isCollapsed ? 'Expand block' : 'Collapse block'}
-											>
-												{isCollapsed ? <LuChevronRight size={16} /> : <LuChevronDown size={16} />}
-											</Button>
-											<Switch
-												checked={entry.enabled}
-												onChange={(event) => {
-													const enabled = event.currentTarget.checked;
-													updatePreferredOrder((order) =>
-														order.map((item, itemIndex) =>
-															itemIndex === index ? { ...item, enabled } : item
-														)
-													);
-												}}
-												label={entry.identifier}
-												size="sm"
-											/>
-											{unsupported && <Badge color="orange" variant="light">{t('instructions.fields.unsupportedBlock')}</Badge>}
-										</Group>
-										<Group gap={4}>
-											<Button
-												size="compact-sm"
-												variant="subtle"
-												leftSection={<LuArrowUp size={14} />}
-												disabled={index === 0}
-												onClick={() => {
-													updatePreferredOrder((order) => {
-														if (index === 0) return order;
-														const next = [...order];
-														[next[index - 1], next[index]] = [next[index], next[index - 1]];
-														return next;
-													});
-												}}
-											>
-												{t('common.up')}
-											</Button>
-											<Button
-												size="compact-sm"
-												variant="subtle"
-												leftSection={<LuArrowDown size={14} />}
-												disabled={index === preferredOrder.order.length - 1}
-												onClick={() => {
-													updatePreferredOrder((order) => {
-														if (index >= order.length - 1) return order;
-														const next = [...order];
-														[next[index], next[index + 1]] = [next[index + 1], next[index]];
-														return next;
-													});
-												}}
-											>
-												{t('common.down')}
-											</Button>
-											<Button
-												size="compact-sm"
-												variant="subtle"
-												color="red"
-												leftSection={<LuTrash2 size={14} />}
-												disabled={isMarkerPrompt}
-												onClick={() => {
-													updatePreferredOrder((order) => order.filter((_, itemIndex) => itemIndex !== index));
-												}}
-											>
-												{t('common.delete')}
-											</Button>
-										</Group>
-									</Group>
-
-									<Collapse in={!isCollapsed}>
-										<Stack gap={6}>
-											{isMarkerPrompt ? (
-												<Alert color="blue" variant="light" title={t('instructions.fields.systemBlockTitle')}>
-													<Stack gap={4}>
-														<Text size="sm">{t('instructions.fields.systemBlockDescription')}</Text>
-														{sourceLabel ? (
-															<Text size="sm">
-																{t('instructions.fields.systemBlockSource')}: {sourceLabel}
-															</Text>
-														) : null}
-													</Stack>
-												</Alert>
-											) : (
-												<Textarea
-													value={prompt.content ?? ''}
-													onChange={(event) => setPromptContent(entry.identifier, event.currentTarget.value)}
-													placeholder={t('instructions.placeholders.promptBlockContent')}
-													minRows={4}
-													autosize
-													styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
-												/>
-											)}
-										</Stack>
-									</Collapse>
-								</Stack>
-							);
-						})}
-
-						<Text fw={600}>{t('instructions.fields.responseConfig')}</Text>
-						<Group grow align="flex-start">
-							<NumberInput
-								label="temperature"
-								value={stAdvanced.responseConfig.temperature}
-								onChange={(value) => setNumericResponseConfig('temperature', value)}
-								allowDecimal
-							/>
-							<NumberInput
-								label="top_p"
-								value={stAdvanced.responseConfig.top_p}
-								onChange={(value) => setNumericResponseConfig('top_p', value)}
-								allowDecimal
-							/>
-							<NumberInput
-								label="top_k"
-								value={stAdvanced.responseConfig.top_k}
-								onChange={(value) => setNumericResponseConfig('top_k', value)}
-								allowDecimal
-							/>
-						</Group>
-						<Group grow align="flex-start">
-							<NumberInput
-								label="top_a"
-								value={stAdvanced.responseConfig.top_a}
-								onChange={(value) => setNumericResponseConfig('top_a', value)}
-								allowDecimal
-							/>
-							<NumberInput
-								label="min_p"
-								value={stAdvanced.responseConfig.min_p}
-								onChange={(value) => setNumericResponseConfig('min_p', value)}
-								allowDecimal
-							/>
-							<NumberInput
-								label="repetition_penalty"
-								value={stAdvanced.responseConfig.repetition_penalty}
-								onChange={(value) => setNumericResponseConfig('repetition_penalty', value)}
-								allowDecimal
-							/>
-						</Group>
-						<Group grow align="flex-start">
-							<NumberInput
-								label="frequency_penalty"
-								value={stAdvanced.responseConfig.frequency_penalty}
-								onChange={(value) => setNumericResponseConfig('frequency_penalty', value)}
-								allowDecimal
-							/>
-							<NumberInput
-								label="presence_penalty"
-								value={stAdvanced.responseConfig.presence_penalty}
-								onChange={(value) => setNumericResponseConfig('presence_penalty', value)}
-								allowDecimal
-							/>
-							<NumberInput
-								label="openai_max_tokens"
-								value={stAdvanced.responseConfig.openai_max_tokens}
-								onChange={(value) => setNumericResponseConfig('openai_max_tokens', value)}
-								min={1}
-							/>
-						</Group>
-						<Group grow align="flex-start">
-							<NumberInput
-								label="seed"
-								value={stAdvanced.responseConfig.seed}
-								onChange={(value) => setNumericResponseConfig('seed', value)}
-							/>
-							<NumberInput
-								label="n"
-								value={stAdvanced.responseConfig.n}
-								onChange={(value) => setNumericResponseConfig('n', value)}
-								min={1}
-							/>
-							<Select
-								label="reasoning_effort"
-								value={stAdvanced.responseConfig.reasoning_effort ?? null}
-								onChange={(value) => setStringResponseConfig('reasoning_effort', value)}
-								clearable
-								data={['auto', 'low', 'medium', 'high', 'min', 'max']}
-							/>
-						</Group>
-						<Group grow align="flex-start">
+					<Group justify="flex-end">
+						<Button variant="light" loading={previewLoading} onClick={onPrerender}>
+							{t('instructions.actions.prerender')}
+						</Button>
+					</Group>
+				</>
+			)}
+
+			{instruction.kind === 'st_base' && stBase && preferredOrder && (
+				<Stack gap="sm">
+					<Group justify="space-between" align="center">
+						<Text fw={600}>{t('instructions.fields.promptBlocks')}</Text>
+						<Group gap="xs">
 							<Select
-								label="verbosity"
-								value={stAdvanced.responseConfig.verbosity ?? null}
-								onChange={(value) => setStringResponseConfig('verbosity', value)}
+								placeholder={t('instructions.placeholders.addPromptBlock')}
+								data={addablePromptIdentifiers.map((identifier) => ({
+									value: identifier,
+									label: identifier,
+								}))}
+								value={newPromptIdentifier}
+								onChange={setNewPromptIdentifier}
 								clearable
-								data={['auto', 'low', 'medium', 'high']}
-							/>
-							<TextInput
-								label={t('instructions.fields.importSource')}
-								value={stAdvanced.importInfo.source}
-								readOnly
-							/>
-							<TextInput
-								label={t('instructions.fields.importFileName')}
-								value={stAdvanced.importInfo.fileName}
-								readOnly
+								w={220}
 							/>
+							<Button
+								size="xs"
+								variant="light"
+								leftSection={<LuPlus size={14} />}
+								disabled={!newPromptIdentifier}
+								onClick={() => {
+									if (!newPromptIdentifier) return;
+									updatePreferredOrder((order) => [
+										...order,
+										{ identifier: newPromptIdentifier, enabled: true },
+									]);
+									setStBase((current) => {
+										if (!current) return current;
+										if (current.prompts.some((item) => item.identifier === newPromptIdentifier)) {
+											return current;
+										}
+										const definition = getStPromptDefinition(newPromptIdentifier);
+										return {
+											...current,
+											prompts: [
+												...current.prompts,
+												definition ?? {
+													identifier: newPromptIdentifier,
+													name: newPromptIdentifier,
+													role: 'system',
+													system_prompt: true,
+													content: '',
+												},
+											],
+										};
+									});
+									setNewPromptIdentifier(null);
+								}}
+							>
+								{t('common.add')}
+							</Button>
 						</Group>
-						<Group grow align="center">
-							<Switch
-								label="enable_web_search"
-								checked={stAdvanced.responseConfig.enable_web_search === true}
-								onChange={(event) =>
-									setBooleanResponseConfig(
-										'enable_web_search',
-										event.currentTarget.checked
-									)
-								}
-							/>
-							<Switch
-								label="stream_openai"
-								checked={stAdvanced.responseConfig.stream_openai === true}
-								onChange={(event) =>
-									setBooleanResponseConfig('stream_openai', event.currentTarget.checked)
-								}
-							/>
-							<TextInput
-								label={t('instructions.fields.importedAt')}
-								value={stAdvanced.importInfo.importedAt}
-								readOnly
-							/>
-						</Group>
-						<Accordion variant="separated">
-							<Accordion.Item value="details">
-								<Accordion.Control>{t('instructions.fields.details')}</Accordion.Control>
-								<Accordion.Panel>
-									<Stack gap="sm">
-										<Textarea
-											label={t('instructions.fields.rawPreset')}
-											value={rawPresetJson}
-											readOnly
-											minRows={6}
-											autosize
-											styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
+					</Group>
+
+					{preferredOrder.order.map((entry, index) => {
+						const prompt = normalizePromptForEdit(promptMap.get(entry.identifier), entry.identifier);
+						const unsupported = !KNOWN_PROMPT_IDENTIFIERS.includes(entry.identifier);
+						const isMarkerPrompt = isSystemMarkerPrompt(prompt);
+						const sourceLabel = getStPromptSourceLabel(entry.identifier);
+						const isCollapsed = isPromptCollapsed(entry.identifier, isMarkerPrompt);
+
+						return (
+							<Stack key={`${entry.identifier}_${index}`} gap={6} p="xs" style={{ border: '1px solid var(--mantine-color-gray-3)', borderRadius: 8 }}>
+								<Group justify="space-between" align="center">
+									<Group gap="xs" align="center">
+										<Button
+											size="compact-sm"
+											variant="subtle"
+											px={4}
+											onClick={() => togglePromptCollapsed(entry.identifier, isMarkerPrompt)}
+											aria-label={isCollapsed ? 'Expand block' : 'Collapse block'}
+										>
+											{isCollapsed ? <LuChevronRight size={16} /> : <LuChevronDown size={16} />}
+										</Button>
+										<Switch
+											checked={entry.enabled}
+											onChange={(event) => {
+												const enabled = event.currentTarget.checked;
+												updatePreferredOrder((order) =>
+													order.map((item, itemIndex) =>
+														itemIndex === index ? { ...item, enabled } : item
+													)
+												);
+											}}
+											label={entry.identifier}
+											size="sm"
 										/>
+										{unsupported && <Badge color="orange" variant="light">{t('instructions.fields.unsupportedBlock')}</Badge>}
+									</Group>
+									<Group gap={4}>
+										<Button
+											size="compact-sm"
+											variant="subtle"
+											leftSection={<LuArrowUp size={14} />}
+											disabled={index === 0}
+											onClick={() => {
+												updatePreferredOrder((order) => {
+													if (index === 0) return order;
+													const next = [...order];
+													[next[index - 1], next[index]] = [next[index], next[index - 1]];
+													return next;
+												});
+											}}
+										>
+											{t('common.up')}
+										</Button>
+										<Button
+											size="compact-sm"
+											variant="subtle"
+											leftSection={<LuArrowDown size={14} />}
+											disabled={index === preferredOrder.order.length - 1}
+											onClick={() => {
+												updatePreferredOrder((order) => {
+													if (index >= order.length - 1) return order;
+													const next = [...order];
+													[next[index], next[index + 1]] = [next[index + 1], next[index]];
+													return next;
+												});
+											}}
+										>
+											{t('common.down')}
+										</Button>
+										<Button
+											size="compact-sm"
+											variant="subtle"
+											color="red"
+											leftSection={<LuTrash2 size={14} />}
+											disabled={isMarkerPrompt}
+											onClick={() => {
+												updatePreferredOrder((order) => order.filter((_, itemIndex) => itemIndex !== index));
+											}}
+										>
+											{t('common.delete')}
+										</Button>
+									</Group>
+								</Group>
+
+								<Collapse in={!isCollapsed}>
+									<Stack gap={6}>
+										{isMarkerPrompt ? (
+											<Alert color="blue" variant="light" title={t('instructions.fields.systemBlockTitle')}>
+												<Stack gap={4}>
+													<Text size="sm">{t('instructions.fields.systemBlockDescription')}</Text>
+													{sourceLabel ? (
+														<Text size="sm">
+															{t('instructions.fields.systemBlockSource')}: {sourceLabel}
+														</Text>
+													) : null}
+												</Stack>
+											</Alert>
+										) : (
+											<Textarea
+												value={prompt.content ?? ''}
+												onChange={(event) => setPromptContent(entry.identifier, event.currentTarget.value)}
+												placeholder={t('instructions.placeholders.promptBlockContent')}
+												minRows={4}
+												autosize
+												styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
+											/>
+										)}
 									</Stack>
-								</Accordion.Panel>
-							</Accordion.Item>
-						</Accordion>
-					</Stack>
-				)}
-
-				<Group justify="flex-end">
-					{!isAdvancedMode && (
-						<Button variant="light" loading={previewLoading} onClick={onPrerender}>
-							{t('instructions.actions.prerender')}
-						</Button>
-					)}
-				</Group>
-			</Stack>
-		</FormProvider>
+								</Collapse>
+							</Stack>
+						);
+					})}
+
+					<Text fw={600}>{t('instructions.fields.responseConfig')}</Text>
+					<Group grow align="flex-start">
+						<NumberInput
+							label="temperature"
+							value={stBase.responseConfig.temperature}
+							onChange={(value) => setNumericResponseConfig('temperature', value)}
+							allowDecimal
+						/>
+						<NumberInput
+							label="top_p"
+							value={stBase.responseConfig.top_p}
+							onChange={(value) => setNumericResponseConfig('top_p', value)}
+							allowDecimal
+						/>
+						<NumberInput
+							label="top_k"
+							value={stBase.responseConfig.top_k}
+							onChange={(value) => setNumericResponseConfig('top_k', value)}
+							allowDecimal
+						/>
+					</Group>
+					<Group grow align="flex-start">
+						<NumberInput
+							label="top_a"
+							value={stBase.responseConfig.top_a}
+							onChange={(value) => setNumericResponseConfig('top_a', value)}
+							allowDecimal
+						/>
+						<NumberInput
+							label="min_p"
+							value={stBase.responseConfig.min_p}
+							onChange={(value) => setNumericResponseConfig('min_p', value)}
+							allowDecimal
+						/>
+						<NumberInput
+							label="repetition_penalty"
+							value={stBase.responseConfig.repetition_penalty}
+							onChange={(value) => setNumericResponseConfig('repetition_penalty', value)}
+							allowDecimal
+						/>
+					</Group>
+					<Group grow align="flex-start">
+						<NumberInput
+							label="frequency_penalty"
+							value={stBase.responseConfig.frequency_penalty}
+							onChange={(value) => setNumericResponseConfig('frequency_penalty', value)}
+							allowDecimal
+						/>
+						<NumberInput
+							label="presence_penalty"
+							value={stBase.responseConfig.presence_penalty}
+							onChange={(value) => setNumericResponseConfig('presence_penalty', value)}
+							allowDecimal
+						/>
+						<NumberInput
+							label="openai_max_tokens"
+							value={stBase.responseConfig.openai_max_tokens}
+							onChange={(value) => setNumericResponseConfig('openai_max_tokens', value)}
+							min={1}
+						/>
+					</Group>
+					<Group grow align="flex-start">
+						<NumberInput
+							label="seed"
+							value={stBase.responseConfig.seed}
+							onChange={(value) => setNumericResponseConfig('seed', value)}
+						/>
+						<NumberInput
+							label="n"
+							value={stBase.responseConfig.n}
+							onChange={(value) => setNumericResponseConfig('n', value)}
+							min={1}
+						/>
+						<Select
+							label="reasoning_effort"
+							value={stBase.responseConfig.reasoning_effort ?? null}
+							onChange={(value) => setStringResponseConfig('reasoning_effort', value)}
+							clearable
+							data={['auto', 'low', 'medium', 'high', 'min', 'max']}
+						/>
+					</Group>
+					<Group grow align="flex-start">
+						<Select
+							label="verbosity"
+							value={stBase.responseConfig.verbosity ?? null}
+							onChange={(value) => setStringResponseConfig('verbosity', value)}
+							clearable
+							data={['auto', 'low', 'medium', 'high']}
+						/>
+						<TextInput
+							label={t('instructions.fields.importSource')}
+							value={stBase.importInfo.source}
+							readOnly
+						/>
+						<TextInput
+							label={t('instructions.fields.importFileName')}
+							value={stBase.importInfo.fileName}
+							readOnly
+						/>
+					</Group>
+					<Group grow align="center">
+						<Switch
+							label="enable_web_search"
+							checked={stBase.responseConfig.enable_web_search === true}
+							onChange={(event) =>
+								setBooleanResponseConfig(
+									'enable_web_search',
+									event.currentTarget.checked
+								)
+							}
+						/>
+						<Switch
+							label="stream_openai"
+							checked={stBase.responseConfig.stream_openai === true}
+							onChange={(event) =>
+								setBooleanResponseConfig('stream_openai', event.currentTarget.checked)
+							}
+						/>
+						<TextInput
+							label={t('instructions.fields.importedAt')}
+							value={stBase.importInfo.importedAt}
+							readOnly
+						/>
+					</Group>
+					<Accordion variant="separated">
+						<Accordion.Item value="details">
+							<Accordion.Control>{t('instructions.fields.details')}</Accordion.Control>
+							<Accordion.Panel>
+								<Stack gap="sm">
+									<Textarea
+										label={t('instructions.fields.rawPreset')}
+										value={rawPresetJson}
+										readOnly
+										minRows={6}
+										autosize
+										styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
+									/>
+								</Stack>
+							</Accordion.Panel>
+						</Accordion.Item>
+					</Accordion>
+				</Stack>
+			)}
+		</Stack>
 	);
 };
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
index cab96c99..b97ad8ad 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
@@ -1,23 +1,26 @@
 import { v4 as uuidv4 } from 'uuid';
 
 import type { OperationProfileDto } from '../../../../api/chat-core';
-import type {
-	LlmOperationParams,
-	LlmOperationRetryOn,
-	LlmOperationSamplers,
-	OperationInProfile,
-	OperationKind,
-	OperationOutput,
-	OperationTemplateParams,
+import {
+	buildOperationArtifactId,
+	makeDefaultOperationArtifactConfig,
+	normalizeOperationArtifactConfig,
+	type LlmOperationParams,
+	type LlmOperationRetryOn,
+	type LlmOperationSamplers,
+	type OperationArtifactConfig,
+	type OperationInProfile,
+	type OperationKind,
+	type OperationTemplateParams,
 } from '@shared/types/operation-profiles';
 
-export type FormTemplateParams = OperationTemplateParams & {
+export type FormTemplateParams = Omit<OperationTemplateParams, 'strictVariables'> & {
 	strictVariables: boolean;
 };
 
 export type FormOtherKindParams = {
 	paramsJson: string;
-	output: OperationOutput;
+	artifact: OperationArtifactConfig;
 };
 
 export type FormLlmKindParams = {
@@ -41,7 +44,7 @@ export type FormLlmKindParams = {
 		backoffMs: number;
 		retryOn: LlmOperationRetryOn[];
 	};
-	output: OperationOutput;
+	artifact: OperationArtifactConfig;
 };
 
 export type FormOperation = {
@@ -73,20 +76,17 @@ export type OperationProfileFormValues = {
 	operations: FormOperation[];
 };
 
-export function makeDefaultArtifactOutput(): Extract<OperationOutput, { type: 'artifacts' }> {
-	return {
-		type: 'artifacts',
-		writeArtifact: {
-			tag: `artifact_${Math.random().toString(16).slice(2, 8)}`,
-			persistence: 'run_only',
-			usage: 'internal',
-			semantics: 'intermediate',
-		},
-	};
+export function makeDefaultArtifactOutput(opId = uuidv4(), kind: OperationKind = 'template'): OperationArtifactConfig {
+	return makeDefaultOperationArtifactConfig({
+		opId,
+		kind,
+		title: 'Artifact',
+	});
 }
 
 export function makeDefaultLlmKindParams(
-	output: OperationOutput = makeDefaultArtifactOutput(),
+	opId: string,
+	artifact: OperationArtifactConfig = makeDefaultArtifactOutput(opId, 'llm'),
 ): FormLlmKindParams {
 	return {
 		providerId: 'openrouter',
@@ -109,123 +109,49 @@ export function makeDefaultLlmKindParams(
 			backoffMs: 0,
 			retryOn: ['timeout', 'provider_error', 'rate_limit'],
 		},
-		output,
+		artifact,
 	};
 }
 
 export function makeDefaultOtherKindParams(
-	output: OperationOutput = makeDefaultArtifactOutput(),
+	opId: string,
+	kind: Exclude<OperationKind, 'template' | 'llm'>,
+	artifact: OperationArtifactConfig = makeDefaultArtifactOutput(opId, kind),
 ): FormOtherKindParams {
 	return {
 		paramsJson: '{\n  \n}',
-		output,
+		artifact,
 	};
 }
 
-function normalizePromptTimeRole(value: unknown): 'system' | 'user' | 'assistant' {
-	if (value === 'user' || value === 'assistant' || value === 'system') return value;
-	if (value === 'developer') return 'system';
-	return 'system';
-}
-
-function normalizeDepthFromEnd(value: unknown): number {
-	if (typeof value !== 'number' || !Number.isFinite(value)) return 0;
-	return Math.max(0, Math.floor(Math.abs(value)));
-}
-
-function normalizeOperationOutput(output: unknown, fallback: OperationOutput): OperationOutput {
-	if (!output || typeof output !== 'object') return fallback;
-	const raw = output as Record<string, unknown>;
-	if (raw.type !== 'prompt_time') return output as OperationOutput;
-
-	const promptTime = raw.promptTime;
-	if (!promptTime || typeof promptTime !== 'object') return fallback;
-	const pt = promptTime as Record<string, unknown>;
-
-	if (pt.kind === 'append_after_last_user') {
-		return {
-			type: 'prompt_time',
-			promptTime: {
-				kind: 'append_after_last_user',
-				role: normalizePromptTimeRole(pt.role),
-				source: typeof pt.source === 'string' ? pt.source : undefined,
-			},
-		};
+function toNonNegativeInteger(value: unknown): number {
+	if (typeof value === 'number' && Number.isFinite(value)) {
+		return Math.max(0, Math.floor(value));
 	}
-
-	if (pt.kind === 'insert_at_depth') {
-		return {
-			type: 'prompt_time',
-			promptTime: {
-				kind: 'insert_at_depth',
-				depthFromEnd: normalizeDepthFromEnd(pt.depthFromEnd),
-				role: normalizePromptTimeRole(pt.role),
-				source: typeof pt.source === 'string' ? pt.source : undefined,
-			},
-		};
+	if (typeof value === 'string') {
+		const normalized = value.trim().replace(',', '.');
+		if (normalized.length === 0) return 0;
+		const parsed = Number(normalized);
+		if (Number.isFinite(parsed)) return Math.max(0, Math.floor(parsed));
 	}
-
-	return output as OperationOutput;
+	return 0;
 }
 
-function normalizeTemplateParams(params: unknown): OperationTemplateParams {
-	if (!params || typeof params !== 'object') {
-		return {
-			template: '',
-			strictVariables: false,
-			output: {
-				type: 'artifacts',
-				writeArtifact: makeDefaultArtifactOutput().writeArtifact,
-			},
-		};
-	}
-
-	const p = params as any;
-	if (p.output && typeof p.output === 'object') {
-		return {
-			template: typeof p.template === 'string' ? p.template : '',
-			strictVariables: Boolean(p.strictVariables),
-			output: normalizeOperationOutput(p.output, makeDefaultArtifactOutput()),
-		};
-	}
-
-	// Legacy compatibility: params.writeArtifact -> params.output.type="artifacts"
-	if (p.writeArtifact && typeof p.writeArtifact === 'object') {
-		return {
-			template: typeof p.template === 'string' ? p.template : '',
-			strictVariables: Boolean(p.strictVariables),
-			output: {
-				type: 'artifacts',
-				writeArtifact: p.writeArtifact,
-			},
-		};
+function normalizeActivation(value: unknown): { everyNTurns: number; everyNContextTokens: number } {
+	if (!value || typeof value !== 'object') {
+		return { everyNTurns: 0, everyNContextTokens: 0 };
 	}
-
+	const raw = value as Record<string, unknown>;
+	const normalize = (input: unknown): number => {
+		const parsed = toNonNegativeInteger(input);
+		return parsed >= 1 ? parsed : 0;
+	};
 	return {
-		template: typeof p.template === 'string' ? p.template : '',
-		strictVariables: Boolean(p.strictVariables),
-		output: {
-			type: 'artifacts',
-			writeArtifact: {
-				tag: `artifact_${Math.random().toString(16).slice(2, 8)}`,
-				persistence: 'run_only',
-				usage: 'internal',
-				semantics: 'intermediate',
-			},
-		},
+		everyNTurns: normalize(raw.everyNTurns),
+		everyNContextTokens: normalize(raw.everyNContextTokens),
 	};
 }
 
-function normalizeOtherKindParams(params: unknown): FormOtherKindParams {
-	const defaultOutput = makeDefaultArtifactOutput();
-	if (!params || typeof params !== 'object') return makeDefaultOtherKindParams(defaultOutput);
-
-	const p = params as any;
-	const output: OperationOutput = normalizeOperationOutput(p.output, defaultOutput);
-	const rawParams = p.params && typeof p.params === 'object' && !Array.isArray(p.params) ? (p.params as Record<string, unknown>) : {};
-	return { paramsJson: JSON.stringify(rawParams, null, 2), output };
-}
-
 function pickNumericSamplers(raw: unknown): LlmOperationSamplers {
 	if (!raw || typeof raw !== 'object') return {};
 	const r = raw as Record<string, unknown>;
@@ -261,54 +187,58 @@ function normalizeRetryOn(value: unknown): LlmOperationRetryOn[] {
 	return unique.length > 0 ? unique : ['timeout', 'provider_error', 'rate_limit'];
 }
 
-function toNonNegativeInteger(value: unknown): number {
-	if (typeof value === 'number' && Number.isFinite(value)) {
-		return Math.max(0, Math.floor(value));
-	}
-	if (typeof value === 'string') {
-		const normalized = value.trim().replace(',', '.');
-		if (normalized.length === 0) return 0;
-		const parsed = Number(normalized);
-		if (Number.isFinite(parsed)) return Math.max(0, Math.floor(parsed));
-	}
-	return 0;
+function normalizeTemplateParams(op: OperationInProfile): FormTemplateParams {
+	const params = op.config.params as Record<string, unknown>;
+	return {
+		template: typeof params.template === 'string' ? params.template : '',
+		strictVariables: Boolean(params.strictVariables),
+		artifact: normalizeOperationArtifactConfig({
+			opId: op.opId,
+			kind: op.kind,
+			title: op.name,
+			rawParams: params,
+		}),
+	};
 }
 
-function normalizeActivation(value: unknown): { everyNTurns: number; everyNContextTokens: number } {
-	if (!value || typeof value !== 'object') {
-		return { everyNTurns: 0, everyNContextTokens: 0 };
-	}
-	const raw = value as Record<string, unknown>;
-	const normalize = (input: unknown): number => {
-		const parsed = toNonNegativeInteger(input);
-		return parsed >= 1 ? parsed : 0;
-	};
+function normalizeOtherKindParams(op: OperationInProfile): FormOtherKindParams {
+	const params = op.config.params as Record<string, unknown>;
+	const rawParams =
+		params.params && typeof params.params === 'object' && !Array.isArray(params.params)
+			? (params.params as Record<string, unknown>)
+			: {};
 	return {
-		everyNTurns: normalize(raw.everyNTurns),
-		everyNContextTokens: normalize(raw.everyNContextTokens),
+		paramsJson: JSON.stringify(rawParams, null, 2),
+		artifact: normalizeOperationArtifactConfig({
+			opId: op.opId,
+			kind: op.kind,
+			title: op.name,
+			rawParams: params,
+		}),
 	};
 }
 
-function normalizeLlmKindParams(params: unknown): FormLlmKindParams {
-	if (!params || typeof params !== 'object') return makeDefaultLlmKindParams();
-
-	const raw = params as any;
-	const llmParamsRaw = raw.params && typeof raw.params === 'object' ? raw.params : {};
-	const output: OperationOutput =
-		normalizeOperationOutput(raw.output, makeDefaultArtifactOutput());
-
-	const base = makeDefaultLlmKindParams(output);
+function normalizeLlmKindParams(op: Extract<OperationInProfile, { kind: 'llm' }>): FormLlmKindParams {
+	const raw = op.config.params as Record<string, unknown>;
+	const llmParamsRaw = raw.params && typeof raw.params === 'object' ? (raw.params as Record<string, unknown>) : {};
 	const providerId = llmParamsRaw.providerId === 'openai_compatible' ? 'openai_compatible' : 'openrouter';
 	const outputMode = llmParamsRaw.outputMode === 'json' ? 'json' : 'text';
 	const jsonParseMode =
 		llmParamsRaw.jsonParseMode === 'markdown_code_block' || llmParamsRaw.jsonParseMode === 'custom_regex'
 			? llmParamsRaw.jsonParseMode
 			: 'raw';
-	const retryRaw = llmParamsRaw.retry && typeof llmParamsRaw.retry === 'object' ? llmParamsRaw.retry : {};
+	const retryRaw = llmParamsRaw.retry && typeof llmParamsRaw.retry === 'object' ? (llmParamsRaw.retry as Record<string, unknown>) : {};
 
 	return {
-		...base,
-		output,
+		...makeDefaultLlmKindParams(
+			op.opId,
+			normalizeOperationArtifactConfig({
+				opId: op.opId,
+				kind: op.kind,
+				title: op.name,
+				rawParams: raw,
+			}),
+		),
 		providerId,
 		credentialRef: typeof llmParamsRaw.credentialRef === 'string' ? llmParamsRaw.credentialRef : '',
 		model: typeof llmParamsRaw.model === 'string' ? llmParamsRaw.model : '',
@@ -320,23 +250,23 @@ function normalizeLlmKindParams(params: unknown): FormLlmKindParams {
 		jsonCustomPattern: typeof llmParamsRaw.jsonCustomPattern === 'string' ? llmParamsRaw.jsonCustomPattern : '',
 		jsonCustomFlags: typeof llmParamsRaw.jsonCustomFlags === 'string' ? llmParamsRaw.jsonCustomFlags : '',
 		jsonSchemaText:
-			typeof llmParamsRaw.jsonSchema === 'undefined'
-				? ''
-				: JSON.stringify(llmParamsRaw.jsonSchema, null, 2),
+			typeof llmParamsRaw.jsonSchema === 'undefined' ? '' : JSON.stringify(llmParamsRaw.jsonSchema, null, 2),
 		strictSchemaValidation: llmParamsRaw.strictSchemaValidation === true,
 		samplerPresetId: typeof llmParamsRaw.samplerPresetId === 'string' ? llmParamsRaw.samplerPresetId : '',
 		samplers: pickNumericSamplers(llmParamsRaw.samplers),
 		timeoutMs:
-			typeof llmParamsRaw.timeoutMs === 'number' && Number.isFinite(llmParamsRaw.timeoutMs) ? llmParamsRaw.timeoutMs : base.timeoutMs,
+			typeof llmParamsRaw.timeoutMs === 'number' && Number.isFinite(llmParamsRaw.timeoutMs)
+				? llmParamsRaw.timeoutMs
+				: 60000,
 		retry: {
 			maxAttempts:
 				typeof retryRaw.maxAttempts === 'number' && Number.isFinite(retryRaw.maxAttempts)
 					? Math.max(1, Math.floor(retryRaw.maxAttempts))
-					: base.retry.maxAttempts,
+					: 1,
 			backoffMs:
 				typeof retryRaw.backoffMs === 'number' && Number.isFinite(retryRaw.backoffMs)
 					? Math.max(0, Math.floor(retryRaw.backoffMs))
-					: base.retry.backoffMs,
+					: 0,
 			retryOn: normalizeRetryOn(retryRaw.retryOn),
 		},
 	};
@@ -364,13 +294,10 @@ export function toOperationProfileForm(profile: OperationProfileDto): OperationP
 				order: Number((op.config as any).order ?? 0),
 				params:
 					op.kind === 'template'
-						? ({
-								...normalizeTemplateParams(op.config.params as unknown),
-								strictVariables: Boolean((op.config.params as any)?.strictVariables),
-							} satisfies FormTemplateParams)
+						? normalizeTemplateParams(op)
 						: op.kind === 'llm'
-							? (normalizeLlmKindParams(op.config.params as unknown) satisfies FormLlmKindParams)
-						: (normalizeOtherKindParams(op.config.params as unknown) satisfies FormOtherKindParams),
+							? normalizeLlmKindParams(op)
+							: normalizeOtherKindParams(op),
 			},
 		})),
 	};
@@ -421,7 +348,10 @@ export function fromOperationProfileForm(
 						params: {
 							template: params.template,
 							strictVariables: params.strictVariables ? true : undefined,
-							output: params.output,
+							artifact: {
+								...params.artifact,
+								artifactId: params.artifact.artifactId || buildOperationArtifactId(op.opId),
+							},
 						},
 					},
 				};
@@ -436,12 +366,8 @@ export function fromOperationProfileForm(
 				const jsonCustomFlags = params.jsonCustomFlags.trim();
 				const jsonSchemaText = params.jsonSchemaText.trim();
 				const timeoutMs = Number.isFinite(params.timeoutMs) ? Math.max(1, Math.floor(params.timeoutMs)) : undefined;
-				const retryMaxAttempts = Number.isFinite(params.retry.maxAttempts)
-					? Math.max(1, Math.floor(params.retry.maxAttempts))
-					: 1;
-				const retryBackoffMs = Number.isFinite(params.retry.backoffMs)
-					? Math.max(0, Math.floor(params.retry.backoffMs))
-					: 0;
+				const retryMaxAttempts = Number.isFinite(params.retry.maxAttempts) ? Math.max(1, Math.floor(params.retry.maxAttempts)) : 1;
+				const retryBackoffMs = Number.isFinite(params.retry.backoffMs) ? Math.max(0, Math.floor(params.retry.backoffMs)) : 0;
 				const retryOn = normalizeRetryOn(params.retry.retryOn);
 				const samplers = pickNumericSamplers(params.samplers);
 				const hasSamplers = Object.keys(samplers).length > 0;
@@ -497,7 +423,10 @@ export function fromOperationProfileForm(
 									retryOn,
 								},
 							},
-							output: params.output,
+							artifact: {
+								...params.artifact,
+								artifactId: params.artifact.artifactId || buildOperationArtifactId(op.opId),
+							},
 						},
 					},
 				};
@@ -509,8 +438,8 @@ export function fromOperationProfileForm(
 			if (raw) {
 				try {
 					parsed = JSON.parse(raw) as unknown;
-				} catch (e) {
-					if (options?.validateJson) throw e;
+				} catch (error) {
+					if (options?.validateJson) throw error;
 					parsed = {};
 				}
 			}
@@ -531,7 +460,10 @@ export function fromOperationProfileForm(
 					dependsOn: op.config.dependsOn?.length ? op.config.dependsOn : undefined,
 					params: {
 						params: asObj,
-						output: params.output,
+						artifact: {
+							...params.artifact,
+							artifactId: params.artifact.artifactId || buildOperationArtifactId(op.opId),
+						},
 					},
 				},
 			};
@@ -540,8 +472,9 @@ export function fromOperationProfileForm(
 }
 
 export function makeDefaultOperation(): FormOperation {
+	const opId = uuidv4();
 	return {
-		opId: uuidv4(),
+		opId,
 		name: 'New operation',
 		description: '',
 		kind: 'template',
@@ -559,7 +492,7 @@ export function makeDefaultOperation(): FormOperation {
 			params: {
 				template: '',
 				strictVariables: false,
-				output: makeDefaultArtifactOutput(),
+				artifact: makeDefaultArtifactOutput(opId, 'template'),
 			},
 		},
 	};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
index 32435e68..5e20ea02 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
@@ -38,15 +38,7 @@ type Props = {
 	onRemove?: () => void;
 };
 
-const kindOptions = [
-	{ value: 'template', label: 'template' },
-	{ value: 'llm', label: 'llm' },
-	{ value: 'rag', label: 'rag' },
-	{ value: 'tool', label: 'tool' },
-	{ value: 'compute', label: 'compute' },
-	{ value: 'transform', label: 'transform' },
-	{ value: 'legacy', label: 'legacy' },
-];
+const kindOptions = ['template', 'llm', 'rag', 'tool', 'compute', 'transform', 'legacy'] as const;
 
 function isOperationKind(value: unknown): value is OperationKind {
 	return (
@@ -68,7 +60,7 @@ function makeSafeOutput(output: unknown) {
 export const OperationEditor: React.FC<Props> = memo(({ index, title, status, canSave, canDiscard, onSave, onDiscard, onRemove }) => {
 	const { t } = useTranslation();
 	const opId = useWatch({ name: `operations.${index}.opId` }) as unknown;
-	const output = useWatch({ name: `operations.${index}.config.params.output` }) as unknown;
+	const artifact = useWatch({ name: `operations.${index}.config.params.artifact` }) as unknown;
 	const { setValue, control } = useFormContext();
 
 	const {
@@ -89,7 +81,7 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 					{status && (
 						<>
 							<Badge variant="light">#{status.index}</Badge>
-							<Badge variant="outline">{status.kind}</Badge>
+							<Badge variant="outline">{t(`operationProfiles.kind.${status.kind}`)}</Badge>
 							{status.isDirty && <Badge color="yellow">{t('operationProfiles.operationEditor.unsaved')}</Badge>}
 						</>
 					)}
@@ -130,31 +122,38 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 				<Select
 					{...kindField}
 					label={t('operationProfiles.fields.kind')}
-					data={kindOptions}
+					data={kindOptions.map((kind) => ({ value: kind, label: t(`operationProfiles.kind.${kind}`) }))}
 					value={normalizedKind}
 					onChange={(next) => {
 						const nextKind: OperationKind = isOperationKind(next) ? next : 'template';
 						onKindChange(nextKind);
 
-						const safeOutput = makeSafeOutput(output);
+						const safeArtifact = makeSafeOutput(artifact);
 
 						if (nextKind === 'template') {
 							const nextParams: FormTemplateParams = {
 								template: '',
 								strictVariables: false,
-								output: safeOutput as FormTemplateParams['output'],
+								artifact: safeArtifact as FormTemplateParams['artifact'],
 							};
 							setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
 							return;
 						}
 
 						if (nextKind === 'llm') {
-							const nextParams: FormLlmKindParams = makeDefaultLlmKindParams(safeOutput as FormLlmKindParams['output']);
+							const nextParams: FormLlmKindParams = makeDefaultLlmKindParams(
+								safeOpId || 'temp-op',
+								safeArtifact as FormLlmKindParams['artifact'],
+							);
 							setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
 							return;
 						}
 
-						const nextParams: FormOtherKindParams = makeDefaultOtherKindParams(safeOutput as FormOtherKindParams['output']);
+						const nextParams: FormOtherKindParams = makeDefaultOtherKindParams(
+							safeOpId || 'temp-op',
+							nextKind as Exclude<OperationKind, 'template' | 'llm'>,
+							safeArtifact as FormOtherKindParams['artifact'],
+						);
 						setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
 					}}
 					comboboxProps={{ withinPortal: false }}
@@ -164,7 +163,7 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 			</Group>
 
 			<Text size="xs" c="dimmed" className="op-opIdText">
-				{t('operationProfiles.fields.opId', { value: safeOpId || '—' })}
+				{t('operationProfiles.fields.opId', { value: safeOpId || '-' })}
 			</Text>
 
 			<OperationSectionsAccordion index={index} kind={normalizedKind} />
@@ -173,3 +172,5 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 });
 
 OperationEditor.displayName = 'OperationEditor';
+
+
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
index 3f9ca6bc..0f0218f6 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
@@ -1,73 +1,57 @@
-import { Group, Select, Stack, Text } from '@mantine/core';
+import { Button, Group, Paper, Select, Stack, Text } from '@mantine/core';
 import React from 'react';
-import { useController, useFormContext } from 'react-hook-form';
+import { Controller, useFieldArray, useFormContext, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
-import { FormInput, FormNumberInput, FormSelect } from '@ui/form-components';
+import { FormCheckbox, FormInput, FormNumberInput, FormSelect } from '@ui/form-components';
 
-import { makeDefaultArtifactOutput } from '../../../form/operation-profile-form-mapping';
+import type { ArtifactExposure } from '@shared/types/operation-profiles';
 
-type OutputType = 'artifacts' | 'prompt_time' | 'turn_canonicalization';
+const formatOptions = ['text', 'markdown', 'json'] as const;
 
-const outputTypeOptions = [
-	{ value: 'artifacts', label: 'operationProfiles.outputType.artifacts' },
-	{ value: 'prompt_time', label: 'operationProfiles.outputType.promptTime' },
-	{ value: 'turn_canonicalization', label: 'operationProfiles.outputType.turnCanonicalization' },
-];
+const persistenceOptions = ['persisted', 'run_only'] as const;
 
-const persistenceOptions = [
-	{ value: 'persisted', label: 'persisted' },
-	{ value: 'run_only', label: 'run_only' },
-];
+const writeModeOptions = ['replace', 'append'] as const;
 
-const usageOptions = [
-	{ value: 'prompt_only', label: 'prompt_only' },
-	{ value: 'ui_only', label: 'ui_only' },
-	{ value: 'prompt+ui', label: 'prompt+ui' },
-	{ value: 'internal', label: 'internal' },
-];
+const promptPartModeOptions = ['prepend', 'append', 'replace'] as const;
 
-const promptTimeRoleOptions = [
-	{ value: 'system', label: 'system' },
-	{ value: 'user', label: 'user' },
-	{ value: 'assistant', label: 'assistant' },
+const exposureTypeOptions = [
+	{ value: 'prompt_part', label: 'operationProfiles.exposureType.promptPart' },
+	{ value: 'prompt_message', label: 'operationProfiles.exposureType.promptMessage' },
+	{ value: 'turn_rewrite', label: 'operationProfiles.exposureType.turnRewrite' },
+	{ value: 'ui_inline', label: 'operationProfiles.exposureType.uiInline' },
 ];
 
-const promptTimeKindOptions = [
-	{ value: 'append_after_last_user', label: 'operationProfiles.promptTimeKind.appendAfterLastUser' },
-	{ value: 'system_update', label: 'operationProfiles.promptTimeKind.systemUpdate' },
-	{ value: 'insert_at_depth', label: 'operationProfiles.promptTimeKind.insertAtDepth' },
-];
+const roleOptions = ['system', 'user', 'assistant'] as const;
 
-const systemUpdateModeOptions = [
-	{ value: 'prepend', label: 'prepend' },
-	{ value: 'append', label: 'append' },
-	{ value: 'replace', label: 'replace' },
+const anchorOptions = [
+	{ value: 'after_last_user', label: 'operationProfiles.anchor.afterLastUser' },
+	{ value: 'depth_from_end', label: 'operationProfiles.anchor.depthFromEnd' },
 ];
 
-function makeDefaultArtifactsOutput() {
-	return { type: 'artifacts' as const, writeArtifact: makeDefaultArtifactOutput().writeArtifact };
-}
+const targetOptions = [
+	{ value: 'current_user_main', label: 'operationProfiles.rewriteTarget.currentUserMain' },
+	{ value: 'assistant_output_main', label: 'operationProfiles.rewriteTarget.assistantOutputMain' },
+];
 
-function makeDefaultPromptTimeOutput() {
-	return {
-		type: 'prompt_time' as const,
-		promptTime: {
-			kind: 'append_after_last_user' as const,
-			role: 'system' as const,
-			source: 'template_output',
-		},
-	};
+function makeDefaultExposure(type: ArtifactExposure['type']): ArtifactExposure {
+	if (type === 'prompt_part') {
+		return { type, target: 'system', mode: 'append' };
+	}
+	if (type === 'prompt_message') {
+		return { type, role: 'system', anchor: 'after_last_user' };
+	}
+	if (type === 'turn_rewrite') {
+		return { type, target: 'current_user_main', mode: 'replace' };
+	}
+	return { type: 'ui_inline', role: 'assistant', anchor: 'after_last_user' };
 }
 
-function makeDefaultTurnCanonicalizationOutput() {
-	return {
-		type: 'turn_canonicalization' as const,
-		canonicalization: {
-			kind: 'replace_text' as const,
-			target: 'user' as const,
-		},
-	};
+function getExposureCardTitle(t: (key: string) => string, exposure: ArtifactExposure): string {
+	if (exposure.type === 'prompt_part') return t('operationProfiles.exposureType.promptPart');
+	if (exposure.type === 'prompt_message') return t('operationProfiles.exposureType.promptMessage');
+	if (exposure.type === 'turn_rewrite') return t('operationProfiles.exposureType.turnRewrite');
+	return t('operationProfiles.exposureType.uiInline');
 }
 
 type Props = {
@@ -77,191 +61,213 @@ type Props = {
 export const OutputSection: React.FC<Props> = ({ index }) => {
 	const { t } = useTranslation();
 	const { control, setValue } = useFormContext();
+	const artifact = useWatch({ control, name: `operations.${index}.config.params.artifact` }) as
+		| {
+				artifactId?: string;
+				exposures?: ArtifactExposure[];
+		  }
+		| undefined;
 
-	const {
-		field: { value: outputType, onChange: onOutputTypeChange, ...outputTypeField },
-	} = useController({
+	const exposuresArray = useFieldArray({
 		control,
-		name: `operations.${index}.config.params.output.type`,
+		name: `operations.${index}.config.params.artifact.exposures`,
 	});
 
-	const normalizedType: OutputType =
-		outputType === 'artifacts' || outputType === 'prompt_time' || outputType === 'turn_canonicalization'
-			? outputType
-			: 'artifacts';
+	return (
+		<Stack gap="md">
+			<Stack gap="xs">
+				<Text size="sm" c="dimmed">
+					{t('operationProfiles.outputNotes.artifactModel')}
+				</Text>
+				<Text size="sm" c="dimmed">
+					{t('operationProfiles.outputNotes.referenceByTag')}
+				</Text>
+				<Text size="xs" c="dimmed">
+					{t('operationProfiles.sectionsLabels.artifactId')}: {artifact?.artifactId ?? '-'}
+				</Text>
+			</Stack>
 
-	const {
-		field: { value: promptTimeKindValue, onChange: onPromptTimeKindChange, ...promptTimeKindField },
-	} = useController({
-		control,
-		name: `operations.${index}.config.params.output.promptTime.kind`,
-	});
+			<Group grow wrap="wrap">
+				<FormInput
+					name={`operations.${index}.config.params.artifact.tag`}
+					label={t('operationProfiles.sectionsLabels.tag')}
+					infoTip={t('operationProfiles.tooltips.tag')}
+				/>
+				<FormInput
+					name={`operations.${index}.config.params.artifact.title`}
+					label={t('operationProfiles.sectionsLabels.artifactTitle')}
+					infoTip={t('operationProfiles.tooltips.artifactTitle')}
+				/>
+				<FormSelect
+					name={`operations.${index}.config.params.artifact.format`}
+					label={t('operationProfiles.sectionsLabels.format')}
+					infoTip={t('operationProfiles.tooltips.format')}
+					selectProps={{ options: formatOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })), comboboxProps: { withinPortal: false } }}
+				/>
+			</Group>
 
-	const promptKind =
-		promptTimeKindValue === 'append_after_last_user' ||
-		promptTimeKindValue === 'system_update' ||
-		promptTimeKindValue === 'insert_at_depth'
-			? promptTimeKindValue
-			: 'append_after_last_user';
+			<Group grow wrap="wrap">
+				<FormSelect
+					name={`operations.${index}.config.params.artifact.persistence`}
+					label={t('operationProfiles.sectionsLabels.persistence')}
+					infoTip={t('operationProfiles.tooltips.persistence')}
+					selectProps={{ options: persistenceOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })), comboboxProps: { withinPortal: false } }}
+				/>
+				<FormSelect
+					name={`operations.${index}.config.params.artifact.writeMode`}
+					label={t('operationProfiles.sectionsLabels.writeMode')}
+					infoTip={t('operationProfiles.tooltips.writeMode')}
+					selectProps={{ options: writeModeOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })), comboboxProps: { withinPortal: false } }}
+				/>
+			</Group>
 
-	return (
-		<Stack gap="xs">
-			<Select
-				{...outputTypeField}
-				label={t('operationProfiles.sectionsLabels.effectType')}
-				data={outputTypeOptions.map((o) => ({ ...o, label: t(o.label) }))}
-				value={normalizedType}
-				onChange={(next) => {
-					const nextType: OutputType = (next as OutputType) ?? 'artifacts';
-					onOutputTypeChange(nextType);
-					if (nextType === 'artifacts') {
-						setValue(`operations.${index}.config.params.output`, makeDefaultArtifactsOutput(), { shouldDirty: true });
-					}
-					if (nextType === 'prompt_time') {
-						setValue(`operations.${index}.config.params.output`, makeDefaultPromptTimeOutput(), { shouldDirty: true });
-					}
-					if (nextType === 'turn_canonicalization') {
-						setValue(`operations.${index}.config.params.output`, makeDefaultTurnCanonicalizationOutput(), { shouldDirty: true });
-					}
-				}}
-				comboboxProps={{ withinPortal: false }}
-				description={t('operationProfiles.tooltips.effectType')}
+			<Group grow wrap="wrap">
+				<FormInput
+					name={`operations.${index}.config.params.artifact.semantics`}
+					label={t('operationProfiles.sectionsLabels.semantics')}
+					infoTip={t('operationProfiles.tooltips.semantics')}
+				/>
+				<FormNumberInput
+					name={`operations.${index}.config.params.artifact.history.maxItems`}
+					label={t('operationProfiles.sectionsLabels.historyMaxItems')}
+					infoTip={t('operationProfiles.tooltips.historyMaxItems')}
+					numberInputProps={{ min: 1, step: 1 }}
+				/>
+			</Group>
+
+			<FormCheckbox
+				name={`operations.${index}.config.params.artifact.history.enabled`}
+				label={t('operationProfiles.sectionsLabels.historyEnabled')}
 			/>
 
-			{normalizedType === 'artifacts' && (
-				<Stack gap="xs">
-					<Group grow wrap="wrap">
-						<FormInput
-							name={`operations.${index}.config.params.output.writeArtifact.tag`}
-							label={t('operationProfiles.sectionsLabels.artifactTag')}
-							infoTip={t('operationProfiles.tooltips.artifactTag')}
-						/>
-						<FormSelect
-							name={`operations.${index}.config.params.output.writeArtifact.persistence`}
-							label={t('operationProfiles.sectionsLabels.persistence')}
-							infoTip={t('operationProfiles.tooltips.persistence')}
-							selectProps={{ options: persistenceOptions, comboboxProps: { withinPortal: false } }}
-						/>
-					</Group>
-					<Group grow wrap="wrap">
-						<FormSelect
-							name={`operations.${index}.config.params.output.writeArtifact.usage`}
-							label={t('operationProfiles.sectionsLabels.usage')}
-							infoTip={t('operationProfiles.tooltips.usage')}
-							selectProps={{ options: usageOptions, comboboxProps: { withinPortal: false } }}
-						/>
-						<FormInput
-							name={`operations.${index}.config.params.output.writeArtifact.semantics`}
-							label={t('operationProfiles.sectionsLabels.semantics')}
-							infoTip={t('operationProfiles.tooltips.semantics')}
-						/>
-					</Group>
-				</Stack>
-			)}
+			<FormInput
+				name={`operations.${index}.config.params.artifact.description`}
+				label={t('operationProfiles.sectionsLabels.artifactDescription')}
+				infoTip={t('operationProfiles.tooltips.artifactDescription')}
+			/>
 
-			{normalizedType === 'prompt_time' && (
-				<Stack gap="xs">
-					<Select
-						{...promptTimeKindField}
-						label={t('operationProfiles.sectionsLabels.promptTimeEffect')}
-						description={t('operationProfiles.tooltips.promptTimeEffect')}
-						data={promptTimeKindOptions.map((o) => ({ ...o, label: t(o.label) }))}
-						value={promptKind}
-						onChange={(next) => {
-							const nextKind = (next as typeof promptTimeKindOptions[number]['value']) ?? 'append_after_last_user';
-							onPromptTimeKindChange(nextKind);
-							if (nextKind === 'system_update') {
-								setValue(
-									`operations.${index}.config.params.output.promptTime`,
-									{ kind: nextKind, mode: 'prepend', source: 'template_output' },
-									{ shouldDirty: true },
-								);
-							}
-							if (nextKind === 'append_after_last_user') {
-								setValue(
-									`operations.${index}.config.params.output.promptTime`,
-									{ kind: nextKind, role: 'system', source: 'template_output' },
-									{ shouldDirty: true },
-								);
-							}
-							if (nextKind === 'insert_at_depth') {
-								setValue(
-									`operations.${index}.config.params.output.promptTime`,
-									{ kind: nextKind, depthFromEnd: 0, role: 'system', source: 'template_output' },
-									{ shouldDirty: true },
-								);
-							}
-						}}
-						comboboxProps={{ withinPortal: false }}
-					/>
+			<Stack gap="xs">
+				<Group justify="space-between" align="center">
+					<Text fw={600}>{t('operationProfiles.sectionsLabels.exposures')}</Text>
+					<Group gap="xs">
+						{exposureTypeOptions.map((option) => (
+							<Button
+								key={option.value}
+								size="xs"
+								variant="light"
+								onClick={() => exposuresArray.append(makeDefaultExposure(option.value as ArtifactExposure['type']))}
+							>
+								{t(option.label)}
+							</Button>
+						))}
+					</Group>
+				</Group>
 
-					{promptKind === 'system_update' && (
-						<Group grow wrap="wrap">
-							<FormSelect
-								name={`operations.${index}.config.params.output.promptTime.mode`}
-								label={t('operationProfiles.sectionsLabels.mode')}
-								infoTip={t('operationProfiles.tooltips.mode')}
-								selectProps={{ options: systemUpdateModeOptions, comboboxProps: { withinPortal: false } }}
-							/>
-							<FormInput
-								name={`operations.${index}.config.params.output.promptTime.source`}
-								label={t('operationProfiles.sectionsLabels.sourceOptional')}
-								infoTip={t('operationProfiles.tooltips.sourceOptional')}
-							/>
-						</Group>
-					)}
+				{exposuresArray.fields.length === 0 && (
+					<Text size="sm" c="dimmed">
+						{t('operationProfiles.outputNotes.noExposures')}
+					</Text>
+				)}
 
-					{(promptKind === 'append_after_last_user' || promptKind === 'insert_at_depth') && (
-						<Group grow wrap="wrap">
-							<FormSelect
-								name={`operations.${index}.config.params.output.promptTime.role`}
-								label={t('operationProfiles.sectionsLabels.role')}
-								infoTip={t('operationProfiles.tooltips.role')}
-								selectProps={{ options: promptTimeRoleOptions, comboboxProps: { withinPortal: false } }}
-							/>
-							<FormInput
-								name={`operations.${index}.config.params.output.promptTime.source`}
-								label={t('operationProfiles.sectionsLabels.sourceOptional')}
-								infoTip={t('operationProfiles.tooltips.sourceOptional')}
-							/>
-						</Group>
-					)}
+				{exposuresArray.fields.map((field, exposureIndex) => {
+					const exposure = (artifact?.exposures?.[exposureIndex] ?? field) as ArtifactExposure;
+					return (
+						<Paper key={field.id} withBorder p="sm">
+							<Stack gap="xs">
+								<Group justify="space-between" align="center">
+									<Text fw={600}>{getExposureCardTitle(t, exposure)}</Text>
+									<Button size="xs" color="red" variant="subtle" onClick={() => exposuresArray.remove(exposureIndex)}>
+										{t('common.delete')}
+									</Button>
+								</Group>
+								<Controller
+									control={control}
+									name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.type`}
+									render={({ field: typeField }) => (
+										<Select
+											label={t('operationProfiles.sectionsLabels.exposureType')}
+											data={exposureTypeOptions.map((option) => ({
+												value: option.value,
+												label: t(option.label),
+											}))}
+											value={typeof typeField.value === 'string' ? typeField.value : exposure.type}
+											onChange={(next) => {
+												if (!next) return;
+												setValue(
+													`operations.${index}.config.params.artifact.exposures.${exposureIndex}`,
+													makeDefaultExposure(next as ArtifactExposure['type']),
+													{ shouldDirty: true },
+												);
+											}}
+											comboboxProps={{ withinPortal: false }}
+										/>
+									)}
+								/>
 
-					{promptKind === 'insert_at_depth' && (
-						<FormNumberInput
-							name={`operations.${index}.config.params.output.promptTime.depthFromEnd`}
-							label={t('operationProfiles.sectionsLabels.depthFromEnd')}
-							infoTip={t('operationProfiles.tooltips.depthFromEnd')}
-							numberInputProps={{ min: 0, step: 1 }}
-						/>
-					)}
+								{exposure.type === 'prompt_part' && (
+									<Group grow wrap="wrap">
+										<FormSelect
+											name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.mode`}
+											label={t('operationProfiles.sectionsLabels.mode')}
+											selectProps={{
+												options: promptPartModeOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })),
+												comboboxProps: { withinPortal: false },
+											}}
+										/>
+									</Group>
+								)}
 
-					<Text size="xs" c="dimmed">
-						{t('operationProfiles.outputNotes.promptTimePayloadSource')}
-					</Text>
-				</Stack>
-			)}
+								{(exposure.type === 'prompt_message' || exposure.type === 'ui_inline') && (
+									<>
+										<Group grow wrap="wrap">
+											<FormSelect
+												name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.role`}
+												label={t('operationProfiles.sectionsLabels.role')}
+												selectProps={{ options: roleOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })), comboboxProps: { withinPortal: false } }}
+											/>
+											<FormSelect
+												name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.anchor`}
+												label={t('operationProfiles.sectionsLabels.anchor')}
+												selectProps={{ options: anchorOptions, comboboxProps: { withinPortal: false } }}
+											/>
+										</Group>
+										<Group grow wrap="wrap">
+										<FormInput
+											name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.source`}
+											label={t('operationProfiles.sectionsLabels.sourceOptional')}
+										/>
+											{exposure.anchor === 'depth_from_end' && (
+												<FormNumberInput
+													name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.depthFromEnd`}
+													label={t('operationProfiles.sectionsLabels.depthFromEnd')}
+													numberInputProps={{ min: 0, step: 1 }}
+												/>
+											)}
+										</Group>
+									</>
+								)}
 
-			{normalizedType === 'turn_canonicalization' && (
-				<Stack gap="xs">
-					<FormSelect
-						name={`operations.${index}.config.params.output.canonicalization.target`}
-						label={t('operationProfiles.sectionsLabels.target')}
-						infoTip={t('operationProfiles.tooltips.target')}
-						selectProps={{
-							options: [
-								{ value: 'user', label: 'user' },
-								{ value: 'assistant', label: 'assistant' },
-							],
-							comboboxProps: { withinPortal: false },
-						}}
-					/>
-					<Text size="xs" c="dimmed">
-						{t('operationProfiles.outputNotes.turnCanonicalization')}
-					</Text>
-				</Stack>
-			)}
+								{exposure.type === 'turn_rewrite' && (
+									<Group grow wrap="wrap">
+										<FormSelect
+											name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.target`}
+											label={t('operationProfiles.sectionsLabels.target')}
+											selectProps={{ options: targetOptions, comboboxProps: { withinPortal: false } }}
+										/>
+										<FormInput
+											name={`operations.${index}.config.params.artifact.exposures.${exposureIndex}.mode`}
+											label={t('operationProfiles.sectionsLabels.mode')}
+											inputProps={{ disabled: true }}
+										/>
+									</Group>
+								)}
+							</Stack>
+						</Paper>
+					);
+				})}
+			</Stack>
 		</Stack>
 	);
 };
 
+
diff --git a/web/src/i18n/resources/en/instructions.ts b/web/src/i18n/resources/en/instructions.ts
index 42f1c9f3..91b3a76c 100644
--- a/web/src/i18n/resources/en/instructions.ts
+++ b/web/src/i18n/resources/en/instructions.ts
@@ -13,6 +13,8 @@ const enInstructions = {
 	},
 	actions: {
 		create: 'Create instruction',
+		createBasic: 'Create basic',
+		createStBase: 'Create st-base',
 		duplicate: 'Duplicate instruction',
 		delete: 'Delete instruction',
 		prerender: 'Prerender',
@@ -27,9 +29,6 @@ const enInstructions = {
 		name: 'Name',
 		templateText: 'Template (LiquidJS)',
 		templateTextDescription: 'Syntax is validated on the backend when saving.',
-		advancedMode: 'Advanced mode (ST-compatible)',
-		fallbackTemplateText: 'Fallback templateText (basic compatibility)',
-		fallbackTemplateTextDescription: 'Used when instruction mode is switched back to basic.',
 		prerender: 'Prerender',
 		prerenderDescription: 'Liquid render result on backend (without LLM generation).',
 		promptBlocks: 'Prompt blocks',
@@ -53,9 +52,14 @@ const enInstructions = {
 	},
 	defaults: {
 		newInstruction: 'New instruction',
+		newStBaseInstruction: 'New st-base instruction',
 		newPreset: 'New preset',
 		importedInstruction: 'Imported instruction',
 	},
+	kinds: {
+		basic: 'basic',
+		stBase: 'st-base',
+	},
 	confirm: {
 		deleteInstruction: 'Delete instruction?',
 		discardChanges: 'You have unsaved changes. Discard them and switch preset?',
@@ -63,6 +67,7 @@ const enInstructions = {
 			'Sensitive connection fields were found. Choose whether to strip them during import or keep them for round-trip export.',
 	},
 	dialogs: {
+		createTitle: 'Choose instruction type',
 		renameTitle: 'Rename preset',
 		saveAsTitle: 'Save preset as',
 		deleteTitle: 'Delete preset',
@@ -75,6 +80,7 @@ const enInstructions = {
 		stPresetOnlyExport: 'Only ST-compatible presets can be exported from this toolbar',
 		importErrorTitle: 'Import error',
 		importMissingTemplateText: 'File does not contain templateText',
+		importMissingStBase: 'File does not contain stBase',
 		importSuccessTitle: 'Import successful',
 		importReadError: 'Failed to read file',
 		createErrorTitle: 'Failed to create instruction',
diff --git a/web/src/i18n/resources/en/operationProfiles.ts b/web/src/i18n/resources/en/operationProfiles.ts
index 4f1df8f9..5c51da26 100644
--- a/web/src/i18n/resources/en/operationProfiles.ts
+++ b/web/src/i18n/resources/en/operationProfiles.ts
@@ -1,4 +1,4 @@
-const enOperationProfiles = {
+const enOperationProfiles = {
 			sidebar: {
 				title: 'Operations',
 			},
@@ -103,15 +103,22 @@
 				dependsOn: 'Depends on',
 				activationEveryNTurns: 'Every N turns',
 				activationEveryNContextTokens: 'Every N context tokens',
-				effectType: 'Effect type',
-				artifactTag: 'Artifact tag',
+				artifactId: 'Artifact id',
+				tag: 'Artifact tag',
+				artifactTitle: 'Artifact title',
+				artifactDescription: 'Artifact description',
+				format: 'Format',
 				persistence: 'Persistence',
-				usage: 'Usage',
+				writeMode: 'Write mode',
+				historyEnabled: 'Store history',
+				historyMaxItems: 'History limit',
 				semantics: 'Semantics',
-				promptTimeEffect: 'Prompt-time effect',
+				exposures: 'Exposures',
+				exposureType: 'Exposure type',
 				mode: 'Mode',
 				sourceOptional: 'Source (optional)',
 				role: 'Role',
+				anchor: 'Anchor',
 				depthFromEnd: 'atDepth',
 				target: 'Target',
 			},
@@ -127,15 +134,17 @@
 					'0 disables this mechanism. If N is set, the operation becomes eligible on every Nth user send event (regenerate/continue/system are ignored).',
 				activationEveryNContextTokens:
 					'0 disables this mechanism. Counts accumulated context tokens for user/assistant messages only (system excluded), estimated as chars/4.',
-				effectType: 'Choose how rendered result is applied during commit at runtime.',
-				artifactTag: 'Use a tag without `art` prefix. Each tag in profile should have a single writer.',
+				artifactTitle: 'Human-readable name for the primary artifact shown in the editor and debug output.',
+				artifactDescription: 'Optional note describing the purpose of the artifact.',
+				format: 'Artifact payload format. For LLM JSON output, `json` is usually the right choice.',
 				persistence: '`persisted` survives turns; `run_only` exists only during current run.',
-				usage: 'Choose whether artifact is used in prompt, UI, both, or internal only.',
+				writeMode: '`replace` overwrites current value; `append` writes a new snapshot and makes it the current value.',
+				historyMaxItems: 'How many latest snapshots to keep for context and debugging.',
 				semantics: 'Semantic label for consumers, e.g. "state" or "log/feed".',
-				promptTimeEffect: 'Effect kind for prompt-time text insertion.',
 				mode: '`prepend` => payload + system; `append` => system + payload; `replace` => system = payload.',
 				sourceOptional: 'Optional source label for debugging/explainability.',
 				role: 'Role for synthetic prompt message.',
+				anchor: 'Where to attach the exposure relative to the current conversation.',
 				depthFromEnd:
 					'0 inserts at the end; N inserts N messages from the end. Large values clamp right after the main system instruction.',
 				target: '`before_main_llm` allows only target=user; `after_main_llm` allows user or assistant.',
@@ -144,19 +153,38 @@
 				activationRule:
 					'Conditions are combined with OR: reaching either threshold is enough. When one triggers, both counters are reset for this operation.',
 			},
-			outputType: {
-				artifacts: 'Artifacts',
-				promptTime: 'Prompt-time effects',
-				turnCanonicalization: 'Turn canonicalization effects',
-			},
 			outputNotes: {
-				promptTimePayloadSource: 'Effect payload source is template-rendered text.',
-				turnCanonicalization: 'Current `replace_text` mode: selected turn part is overwritten with template output.',
+				artifactModel:
+					'Each operation writes to one primary artifact. Exposures define how that value is additionally materialized into prompt state, turn rewrites, or UI.',
+				referenceByTag: 'In templates, reference another artifact as {{art.story_summary.value}}.',
+				noExposures: 'This artifact has no exposures yet. It will be available only as artifact state.',
+			},
+			exposureType: {
+				promptPart: 'Prompt part',
+				promptMessage: 'Prompt message',
+				turnRewrite: 'Turn rewrite',
+				uiInline: 'UI inline',
+			},
+			anchor: {
+				afterLastUser: 'After last user',
+				depthFromEnd: 'Depth from end',
 			},
-			promptTimeKind: {
-				appendAfterLastUser: 'prompt.append_after_last_user',
-				systemUpdate: 'prompt.system_update',
-				insertAtDepth: 'prompt.insert_at_depth',
+			rewriteTarget: {
+				currentUserMain: 'Current user main',
+				assistantOutputMain: 'Assistant output main',
+			},
+			valueLabel: {
+				text: 'Text',
+				markdown: 'Markdown',
+				json: 'JSON',
+				persisted: 'Persisted',
+				run_only: 'Run only',
+				replace: 'Replace',
+				append: 'Append',
+				prepend: 'Prepend',
+				system: 'System',
+				user: 'User',
+				assistant: 'Assistant',
 			},
 			kind: {
 				template: 'Template',
@@ -317,3 +345,4 @@
 
 export default enOperationProfiles;
 
+
diff --git a/web/src/i18n/resources/ru/instructions.ts b/web/src/i18n/resources/ru/instructions.ts
index 251bb76d..6ad4cf81 100644
--- a/web/src/i18n/resources/ru/instructions.ts
+++ b/web/src/i18n/resources/ru/instructions.ts
@@ -13,6 +13,8 @@ const ruInstructions = {
 	},
 	actions: {
 		create: 'Создать инструкцию',
+		createBasic: 'Создать basic',
+		createStBase: 'Создать st-base',
 		duplicate: 'Дублировать инструкцию',
 		delete: 'Удалить инструкцию',
 		prerender: 'Пререндер',
@@ -27,9 +29,6 @@ const ruInstructions = {
 		name: 'Название',
 		templateText: 'Template (LiquidJS)',
 		templateTextDescription: 'Синтаксис проверяется на бэкенде при сохранении.',
-		advancedMode: 'Расширенный режим (ST-совместимый)',
-		fallbackTemplateText: 'Fallback templateText (совместимость basic)',
-		fallbackTemplateTextDescription: 'Используется, если режим инструкции переключён обратно на basic.',
 		prerender: 'Пререндер',
 		prerenderDescription: 'Результат рендера Liquid на бэкенде (без генерации LLM).',
 		promptBlocks: 'Блоки промпта',
@@ -53,9 +52,14 @@ const ruInstructions = {
 	},
 	defaults: {
 		newInstruction: 'Новая инструкция',
+		newStBaseInstruction: 'Новая st-base инструкция',
 		newPreset: 'Новый пресет',
 		importedInstruction: 'Импортированная инструкция',
 	},
+	kinds: {
+		basic: 'basic',
+		stBase: 'st-base',
+	},
 	confirm: {
 		deleteInstruction: 'Удалить инструкцию?',
 		discardChanges: 'Есть несохранённые изменения. Отбросить их и переключить пресет?',
@@ -63,6 +67,7 @@ const ruInstructions = {
 			'Найдены чувствительные connection-поля. Выберите, удалить их при импорте или сохранить для round-trip экспорта.',
 	},
 	dialogs: {
+		createTitle: 'Выберите тип инструкции',
 		renameTitle: 'Переименовать пресет',
 		saveAsTitle: 'Сохранить пресет как',
 		deleteTitle: 'Удалить пресет',
@@ -75,6 +80,7 @@ const ruInstructions = {
 		stPresetOnlyExport: 'Из этого toolbar можно экспортировать только ST-совместимые пресеты',
 		importErrorTitle: 'Ошибка импорта',
 		importMissingTemplateText: 'Файл не содержит templateText',
+		importMissingStBase: 'Файл не содержит stBase',
 		importSuccessTitle: 'Импорт успешен',
 		importReadError: 'Не удалось прочитать файл',
 		createErrorTitle: 'Не удалось создать инструкцию',
diff --git a/web/src/i18n/resources/ru/operationProfiles.ts b/web/src/i18n/resources/ru/operationProfiles.ts
index 01b69409..553b67df 100644
--- a/web/src/i18n/resources/ru/operationProfiles.ts
+++ b/web/src/i18n/resources/ru/operationProfiles.ts
@@ -1,4 +1,4 @@
-const ruOperationProfiles = {
+const ruOperationProfiles = {
 			sidebar: {
 				title: 'Операции',
 			},
@@ -97,22 +97,29 @@
 				description: 'Описание',
 				enabled: 'Включено',
 				required: 'Обязательная',
-				hook: 'Hook',
+				hook: 'Хук',
 				triggers: 'Триггеры',
 				order: 'Порядок',
 				dependsOn: 'Зависит от',
 				activationEveryNTurns: 'Каждые N ходов',
 				activationEveryNContextTokens: 'Каждые N токенов контекста',
-				effectType: 'Тип эффекта',
-				artifactTag: 'Тег артефакта',
-				persistence: 'Persistence',
-				usage: 'Usage',
-				semantics: 'Semantics',
-				promptTimeEffect: 'Эффект prompt-time',
+				artifactId: 'Идентификатор артефакта',
+				tag: 'Тег артефакта',
+				artifactTitle: 'Заголовок артефакта',
+				artifactDescription: 'Описание артефакта',
+				format: 'Формат',
+				persistence: 'Хранение',
+				writeMode: 'Режим записи',
+				historyEnabled: 'Хранить историю',
+				historyMaxItems: 'Лимит истории',
+				semantics: 'Семантика',
+				exposures: 'Экспозиции',
+				exposureType: 'Тип экспозиции',
 				mode: 'Режим',
 				sourceOptional: 'Источник (опционально)',
 				role: 'Роль',
-				depthFromEnd: 'atDepth',
+				anchor: 'Якорь',
+				depthFromEnd: 'Глубина от конца',
 				target: 'Цель',
 			},
 			tooltips: {
@@ -127,15 +134,18 @@
 					'0 — выключено. Если задано N, операция станет доступна на каждом N-м событии user send (регенерация/continue/system не учитываются).',
 				activationEveryNContextTokens:
 					'0 — выключено. Считается накопление токенов только по user/assistant сообщениям контекста (без system), оценка chars/4.',
-				effectType: 'Выберите, как применить отрендеренный результат при commit во время выполнения.',
-				artifactTag: 'Используйте тег без префикса art. У каждого тега в профиле должен быть один writer.',
+				artifactTitle: 'Человекочитаемое имя primary artifact, которое будет видно в редакторе и отладке.',
+				artifactDescription: 'Необязательное пояснение назначения артефакта.',
+				tag: 'Человекочитаемый тег для ссылок на артефакт из других шаблонов через art.<tag>.',
+				format: 'Формат значения артефакта. Для LLM json-выхода обычно нужен json.',
 				persistence: 'persisted переживает ходы; run_only существует только в текущем запуске.',
-				usage: 'Выберите, используется ли артефакт в prompt, UI, обоих, или только внутренне.',
+				writeMode: 'replace переписывает current value; append добавляет новый snapshot в историю и делает его current.',
+				historyMaxItems: 'Сколько последних snapshot-значений хранить для контекста и отладки.',
 				semantics: 'Семантическая метка для потребителей, например "state" или "log/feed".',
-				promptTimeEffect: 'Тип эффекта для prompt-time вставки текста.',
 				mode: 'prepend => payload + system; append => system + payload; replace => system = payload.',
 				sourceOptional: 'Необязательная метка источника для отладки/объяснимости.',
 				role: 'Роль для синтетического prompt-сообщения.',
+				anchor: 'Куда прикреплять exposure относительно текущего диалога.',
 				depthFromEnd:
 					'0 — вставить в конец; N — вставить на глубине N от конца. Большие значения ограничиваются позицией сразу после основной system-инструкции.',
 				target: 'before_main_llm допускает только target=user; after_main_llm допускает user или assistant.',
@@ -144,27 +154,46 @@
 				activationRule:
 					'Условия объединяются по OR: достаточно одного порога. При срабатывании одного — оба счетчика этой операции сбрасываются.',
 			},
-			outputType: {
-				artifacts: 'Artifacts',
-				promptTime: 'Prompt-time effects',
-				turnCanonicalization: 'Turn canonicalization effects',
-			},
 			outputNotes: {
-				promptTimePayloadSource: 'Источник payload эффекта — текст, отрендеренный шаблоном.',
-				turnCanonicalization: 'Текущий режим replace_text: выбранная часть хода перезаписывается template output.',
+				artifactModel:
+					'Операция всегда пишет в один primary artifact. Exposures определяют, как это значение дополнительно материализуется в prompt, turn rewrite или UI.',
+				referenceByTag: 'В шаблонах можно ссылаться на другой артефакт как {{art.story_summary.value}}.',
+				noExposures: 'У этого артефакта пока нет экспозиций. Он будет доступен только как состояние артефакта.',
+			},
+			exposureType: {
+				promptPart: 'Часть промпта',
+				promptMessage: 'Сообщение промпта',
+				turnRewrite: 'Перезапись хода',
+				uiInline: 'Встроенный UI',
+			},
+			anchor: {
+				afterLastUser: 'После последнего user',
+				depthFromEnd: 'На глубине от конца',
 			},
-			promptTimeKind: {
-				appendAfterLastUser: 'prompt.append_after_last_user',
-				systemUpdate: 'prompt.system_update',
-				insertAtDepth: 'prompt.insert_at_depth',
+			rewriteTarget: {
+				currentUserMain: 'Текущий user main',
+				assistantOutputMain: 'Основной ответ assistant',
+			},
+			valueLabel: {
+				text: 'Текст',
+				markdown: 'Markdown',
+				json: 'JSON',
+				persisted: 'Сохранять',
+				run_only: 'Только на запуск',
+				replace: 'Заменить',
+				append: 'Добавить',
+				prepend: 'В начало',
+				system: 'Система',
+				user: 'Пользователь',
+				assistant: 'Ассистент',
 			},
 			kind: {
-				template: 'Template',
+				template: 'Шаблон',
 				llm: 'LLM',
 				rag: 'RAG',
-				tool: 'Tool',
-				compute: 'Compute',
-				transform: 'Transform',
+				tool: 'Инструмент',
+				compute: 'Вычисление',
+				transform: 'Преобразование',
 				legacy: 'Legacy',
 			},
 			kindSection: {
@@ -317,3 +346,4 @@
 
 export default ruOperationProfiles;
 
+
diff --git a/web/src/model/instructions/index.ts b/web/src/model/instructions/index.ts
index e38f2e26..c79d6e61 100644
--- a/web/src/model/instructions/index.ts
+++ b/web/src/model/instructions/index.ts
@@ -10,27 +10,48 @@ import {
 } from '../../api/instructions';
 import i18n from '../../i18n';
 import { $currentChat, setChatInstructionRequested, setOpenedChat } from '../chat-core';
-
-import type { InstructionDto } from '../../api/instructions';
-import type { InstructionMeta } from '@shared/types/instructions';
-
-export type InstructionEditorDraft = {
-	sourceInstructionId: string;
-	name: string;
-	templateText: string;
-	meta?: InstructionMeta;
-};
+import { createDefaultStBaseConfig } from './st-preset';
+
+import type { CreateInstructionDraft, InstructionDto } from '../../api/instructions';
+import type { InstructionMeta, StBaseConfig } from '@shared/types/instructions';
+
+export type InstructionEditorDraft =
+	| {
+			sourceInstructionId: string;
+			kind: 'basic';
+			name: string;
+			templateText: string;
+			meta?: InstructionMeta;
+	  }
+	| {
+			sourceInstructionId: string;
+			kind: 'st_base';
+			name: string;
+			stBase: StBaseConfig;
+			meta?: InstructionMeta;
+	  };
 
 function isInstructionDto(value: unknown): value is InstructionDto {
 	if (!value || typeof value !== 'object') return false;
 	const item = value as Record<string, unknown>;
-	return (
-		typeof item.id === 'string' &&
-		item.id.trim().length > 0 &&
-		typeof item.name === 'string' &&
-		typeof item.templateText === 'string' &&
-		(item.engine === 'liquidjs')
-	);
+	if (
+		typeof item.id !== 'string' ||
+		item.id.trim().length === 0 ||
+		typeof item.name !== 'string' ||
+		item.engine !== 'liquidjs'
+	) {
+		return false;
+	}
+
+	if (item.kind === 'basic') {
+		return typeof item.templateText === 'string';
+	}
+
+	if (item.kind === 'st_base') {
+		return typeof item.stBase === 'object' && item.stBase !== null;
+	}
+
+	return false;
 }
 
 function resolveCopyName(originalName: string, usedNames: Set<string>): string {
@@ -71,14 +92,12 @@ sample({
 	target: loadInstructionsFx,
 });
 
-// Sync selection from current chat on chat open.
 sample({
 	clock: setOpenedChat,
 	fn: ({ chat }) => chat.instructionId,
 	target: setSelectedInstructionId,
 });
 
-// Pick a valid template when list or chat changes.
 sample({
 	clock: loadInstructionsFx.doneData,
 	source: { selectedId: $selectedInstructionId, chat: $currentChat },
@@ -94,7 +113,6 @@ sample({
 	target: setSelectedInstructionId,
 });
 
-// If the chat points to a missing instruction (e.g. it was deleted), move it to the first available instruction.
 sample({
 	clock: loadInstructionsFx.doneData,
 	source: $currentChat,
@@ -103,7 +121,6 @@ sample({
 	target: setChatInstructionRequested,
 });
 
-// If the chat has no instruction, auto-assign the first available instruction.
 sample({
 	clock: [setOpenedChat, loadInstructionsFx.doneData],
 	source: { chat: $currentChat, instructions: $instructions },
@@ -134,25 +151,14 @@ sample({
 	target: setChatInstructionRequested,
 });
 
-export const createInstructionFx = createEffect(
-	async (params: { name: string; templateText: string; meta?: InstructionMeta }) => {
-		return createInstruction({
-			name: params.name,
-			templateText: params.templateText,
-			meta: params.meta,
-		});
-	},
-);
+export const createInstructionFx = createEffect(async (params: CreateInstructionDraft) => createInstruction(params));
 
 export const updateInstructionFx = createEffect(
-	async (params: { id: string; name: string; templateText: string; meta?: InstructionMeta }) => {
-		return updateInstruction({
-			id: params.id,
-			name: params.name,
-			templateText: params.templateText,
-			meta: params.meta,
-		});
-	},
+	async (
+		params:
+			| { id: string; kind: 'basic'; name: string; templateText: string; meta?: InstructionMeta }
+			| { id: string; kind: 'st_base'; name: string; stBase: StBaseConfig; meta?: InstructionMeta }
+	) => updateInstruction(params),
 );
 
 export const deleteInstructionFx = createEffect(async (params: { id: string }) => deleteInstruction(params.id));
@@ -161,18 +167,29 @@ export const $instructionEditorDraft = createStore<InstructionEditorDraft | null
 	.on(instructionEditorDraftChanged, (_, draft) => draft)
 	.reset(setSelectedInstructionId, deleteInstructionFx.doneData);
 
-export const createInstructionRequested = createEvent();
+export const createInstructionRequested = createEvent<{ kind: 'basic' | 'st_base' }>();
 export const duplicateInstructionRequested = createEvent<{ id: string }>();
-export const importInstructionRequested = createEvent<{ name: string; templateText: string; meta?: InstructionMeta }>();
-export const updateInstructionRequested = createEvent<{ id: string; name: string; templateText: string; meta?: InstructionMeta }>();
+export const importInstructionRequested = createEvent<CreateInstructionDraft>();
+export const updateInstructionRequested = createEvent<
+	| { id: string; kind: 'basic'; name: string; templateText: string; meta?: InstructionMeta }
+	| { id: string; kind: 'st_base'; name: string; stBase: StBaseConfig; meta?: InstructionMeta }
+>();
 export const deleteInstructionRequested = createEvent<{ id: string }>();
 
 sample({
 	clock: createInstructionRequested,
-	fn: () => ({
-		name: i18n.t('instructions.defaults.newInstruction'),
-		templateText: '{{char.name}}',
-	}),
+	fn: ({ kind }) =>
+		kind === 'basic'
+			? {
+					kind: 'basic' as const,
+					name: i18n.t('instructions.defaults.newInstruction'),
+					templateText: '{{char.name}}',
+			  }
+			: {
+					kind: 'st_base' as const,
+					name: i18n.t('instructions.defaults.newStBaseInstruction'),
+					stBase: createDefaultStBaseConfig(),
+			  },
 	target: createInstructionFx,
 });
 
@@ -180,14 +197,24 @@ sample({
 	clock: duplicateInstructionRequested,
 	source: $instructions,
 	filter: (items, payload) => items.some((t) => t.id === payload.id),
-	fn: (items, payload) => {
-		const tpl = items.find((t) => t.id === payload.id)!;
+	fn: (items, payload): CreateInstructionDraft => {
+		const instruction = items.find((t) => t.id === payload.id)!;
 		const usedNames = new Set(items.map((item) => item.name));
-		const name = resolveCopyName(tpl.name, usedNames);
+		const name = resolveCopyName(instruction.name, usedNames);
+		const meta = { ...(instruction.meta ?? {}), duplicatedFromId: instruction.id, source: 'duplicate' };
+		if (instruction.kind === 'st_base') {
+			return {
+				kind: 'st_base',
+				name,
+				stBase: structuredClone(instruction.stBase),
+				meta,
+			};
+		}
 		return {
+			kind: 'basic',
 			name,
-			templateText: tpl.templateText,
-			meta: { duplicatedFromId: tpl.id, source: 'duplicate' },
+			templateText: instruction.templateText,
+			meta,
 		};
 	},
 	target: createInstructionFx,
@@ -257,5 +284,4 @@ deleteInstructionFx.failData.watch((error) => {
 	});
 });
 
-// Initial load on app start. Expose a manual trigger as well.
 export const instructionsInitRequested = refreshRequested;
diff --git a/web/src/model/instructions/st-preset.ts b/web/src/model/instructions/st-preset.ts
index 97f41afb..dd17c5d1 100644
--- a/web/src/model/instructions/st-preset.ts
+++ b/web/src/model/instructions/st-preset.ts
@@ -1,16 +1,14 @@
 import type {
-	InstructionMeta,
-	StAdvancedConfig,
-	StAdvancedResponseConfig,
-	StPrompt,
-	StPromptOrder,
-	TsInstructionMetaV1,
+	StBaseConfig,
+	StBasePrompt,
+	StBasePromptOrder,
+	StBaseResponseConfig,
 } from '@shared/types/instructions';
 import type { LlmProviderConfig, LlmProviderId } from '@shared/types/llm';
 
 const PROMPT_ORDER_PREFERRED_CHARACTER_ID = 100001;
 
-export const ST_SYSTEM_PROMPT_DEFAULTS: StPrompt[] = [
+export const ST_SYSTEM_PROMPT_DEFAULTS: StBasePrompt[] = [
 	{
 		identifier: 'main',
 		name: 'Main Prompt',
@@ -127,7 +125,7 @@ export const ST_SENSITIVE_FIELDS = [
 type SensitiveImportMode = 'remove' | 'keep';
 type ConnectionFieldStatus = 'supported' | 'sensitive' | 'unsupported';
 
-type StResponseConfigKey = keyof StAdvancedResponseConfig;
+type StResponseConfigKey = keyof StBaseResponseConfig;
 type StResponseNumericKey =
 	| 'temperature'
 	| 'top_p'
@@ -203,19 +201,19 @@ function toOptionalBoolean(value: unknown): boolean | undefined {
 	return typeof value === 'boolean' ? value : undefined;
 }
 
-function normalizeStPromptRole(value: unknown): StPrompt['role'] | undefined {
+function normalizeStPromptRole(value: unknown): StBasePrompt['role'] | undefined {
 	if (value === 'system' || value === 'user' || value === 'assistant') {
 		return value;
 	}
 	return undefined;
 }
 
-function normalizePrompt(value: unknown): StPrompt | null {
+function normalizePrompt(value: unknown): StBasePrompt | null {
 	if (!isRecord(value)) return null;
 	const identifier = asString(value.identifier);
 	if (!identifier) return null;
 
-	const prompt: StPrompt = { identifier };
+	const prompt: StBasePrompt = { identifier };
 	const name = asString(value.name);
 	if (name) prompt.name = name;
 	const role = normalizeStPromptRole(value.role);
@@ -242,7 +240,7 @@ function normalizePromptOrderEntry(
 	};
 }
 
-function normalizePromptOrderItem(value: unknown): StPromptOrder | null {
+function normalizePromptOrderItem(value: unknown): StBasePromptOrder | null {
 	if (!isRecord(value)) return null;
 	const rawCharacterId = value.character_id;
 	const characterId =
@@ -264,8 +262,8 @@ function normalizePromptOrderItem(value: unknown): StPromptOrder | null {
 
 function normalizeResponseConfig(
 	preset: Record<string, unknown>
-): StAdvancedResponseConfig {
-	const responseConfig: StAdvancedResponseConfig = {};
+): StBaseResponseConfig {
+	const responseConfig: StBaseResponseConfig = {};
 	const numericKeys: StResponseNumericKey[] = [
 		'temperature',
 		'top_p',
@@ -304,45 +302,26 @@ function normalizeResponseConfig(
 	return responseConfig;
 }
 
-function normalizeMeta(meta: unknown): InstructionMeta {
-	if (!isRecord(meta)) return {};
-	return { ...meta };
-}
-
-export function getTsInstructionMeta(meta: unknown): TsInstructionMetaV1 | null {
-	if (!isRecord(meta) || !isRecord(meta.tsInstruction)) return null;
-	const tsInstruction = meta.tsInstruction;
-	if (tsInstruction.version !== 1) return null;
-	if (tsInstruction.mode !== 'basic' && tsInstruction.mode !== 'st_advanced') {
-		return null;
-	}
-	return tsInstruction as TsInstructionMetaV1;
-}
-
-export function withTsInstructionMeta(params: {
-	meta: unknown;
-	tsInstruction: TsInstructionMetaV1;
-}): InstructionMeta {
-	const normalized = normalizeMeta(params.meta);
+export function createDefaultStBaseConfig(): StBaseConfig {
 	return {
-		...normalized,
-		tsInstruction: params.tsInstruction,
-	};
-}
-
-export function createTsInstructionMeta(params: {
-	meta: unknown;
-	mode: TsInstructionMetaV1['mode'];
-	stAdvanced: StAdvancedConfig;
-}): InstructionMeta {
-	return withTsInstructionMeta({
-		meta: params.meta,
-		tsInstruction: {
-			version: 1,
-			mode: params.mode,
-			stAdvanced: params.stAdvanced,
+		rawPreset: {},
+		prompts: normalizeStPrompts([]),
+		promptOrder: [
+			{
+				character_id: PROMPT_ORDER_PREFERRED_CHARACTER_ID,
+				order: [
+					{ identifier: 'main', enabled: true },
+					{ identifier: 'chatHistory', enabled: true },
+				],
+			},
+		],
+		responseConfig: {},
+		importInfo: {
+			source: 'sillytavern',
+			fileName: 'manual',
+			importedAt: new Date().toISOString(),
 		},
-	});
+	};
 }
 
 export function detectStChatCompletionPreset(
@@ -367,10 +346,10 @@ export function stripSensitiveFieldsFromPreset(
 	return cloned;
 }
 
-export function normalizeStPrompts(input: unknown): StPrompt[] {
-	if (!Array.isArray(input)) return [];
-	const normalized = input.map(normalizePrompt).filter((item): item is StPrompt => Boolean(item));
-	const byIdentifier = new Map<string, StPrompt>();
+export function normalizeStPrompts(input: unknown): StBasePrompt[] {
+	if (!Array.isArray(input)) return [...ST_SYSTEM_PROMPT_DEFAULTS];
+	const normalized = input.map(normalizePrompt).filter((item): item is StBasePrompt => Boolean(item));
+	const byIdentifier = new Map<string, StBasePrompt>();
 
 	for (const prompt of ST_SYSTEM_PROMPT_DEFAULTS) {
 		byIdentifier.set(prompt.identifier, { ...prompt });
@@ -387,18 +366,18 @@ export function normalizeStPrompts(input: unknown): StPrompt[] {
 	return Array.from(byIdentifier.values());
 }
 
-export function normalizeStPromptOrder(input: unknown): StPromptOrder[] {
+export function normalizeStPromptOrder(input: unknown): StBasePromptOrder[] {
 	if (!Array.isArray(input)) return [];
 	return input
 		.map(normalizePromptOrderItem)
-		.filter((item): item is StPromptOrder => Boolean(item));
+		.filter((item): item is StBasePromptOrder => Boolean(item));
 }
 
-export function createStAdvancedConfigFromPreset(params: {
+export function createStBaseConfigFromPreset(params: {
 	preset: Record<string, unknown>;
 	fileName: string;
 	sensitiveImportMode: SensitiveImportMode;
-}): StAdvancedConfig {
+}): StBaseConfig {
 	const rawPreset =
 		params.sensitiveImportMode === 'remove'
 			? stripSensitiveFieldsFromPreset(params.preset)
@@ -416,19 +395,11 @@ export function createStAdvancedConfigFromPreset(params: {
 	};
 }
 
-export function deriveInstructionTemplateText(stAdvanced: StAdvancedConfig): string {
-	const mainPrompt = stAdvanced.prompts.find((item) => item.identifier === 'main');
-	if (typeof mainPrompt?.content === 'string' && mainPrompt.content.trim().length > 0) {
-		return mainPrompt.content;
-	}
-	return '{{char.name}}';
-}
-
-export function resolvePreferredPromptOrder(stAdvanced: StAdvancedConfig): StPromptOrder {
+export function resolvePreferredPromptOrder(stBase: StBaseConfig): StBasePromptOrder {
 	const preferred =
-		stAdvanced.promptOrder.find(
+		stBase.promptOrder.find(
 			(item) => item.character_id === PROMPT_ORDER_PREFERRED_CHARACTER_ID
-		) ?? stAdvanced.promptOrder[0];
+		) ?? stBase.promptOrder[0];
 
 	if (preferred) {
 		return {
@@ -439,18 +410,18 @@ export function resolvePreferredPromptOrder(stAdvanced: StAdvancedConfig): StPro
 
 	return {
 		character_id: PROMPT_ORDER_PREFERRED_CHARACTER_ID,
-		order: stAdvanced.prompts.map((item) => ({
+		order: stBase.prompts.map((item) => ({
 			identifier: item.identifier,
 			enabled: true,
 		})),
 	};
 }
 
-export function getStPromptDefinition(identifier: string): StPrompt | null {
+export function getStPromptDefinition(identifier: string): StBasePrompt | null {
 	return ST_SYSTEM_PROMPT_DEFAULTS.find((item) => item.identifier === identifier) ?? null;
 }
 
-export function isSystemMarkerPrompt(prompt: StPrompt | null | undefined): boolean {
+export function isSystemMarkerPrompt(prompt: StBasePrompt | null | undefined): boolean {
 	return prompt?.marker === true;
 }
 
@@ -458,16 +429,16 @@ export function getStPromptSourceLabel(identifier: string): string | null {
 	return ST_PROMPT_SOURCE_LABELS[identifier] ?? null;
 }
 
-export function buildStPresetFromAdvanced(stAdvanced: StAdvancedConfig): Record<string, unknown> {
-	const preset = structuredClone(stAdvanced.rawPreset ?? {});
-	preset.prompts = stAdvanced.prompts.map((item) => ({ ...item }));
-	preset.prompt_order = stAdvanced.promptOrder.map((item) => ({
+export function buildStPresetFromStBase(stBase: StBaseConfig): Record<string, unknown> {
+	const preset = structuredClone(stBase.rawPreset ?? {});
+	preset.prompts = stBase.prompts.map((item) => ({ ...item }));
+	preset.prompt_order = stBase.promptOrder.map((item) => ({
 		character_id: item.character_id,
 		order: item.order.map((orderItem) => ({ ...orderItem })),
 	}));
 
 	for (const key of ST_RESPONSE_CONFIG_KEYS) {
-		const value = stAdvanced.responseConfig[key];
+		const value = stBase.responseConfig[key];
 		if (typeof value === 'undefined') {
 			delete preset[key];
 			continue;
@@ -498,8 +469,8 @@ export function listConnectionFieldWarnings(preset: Record<string, unknown>): st
 	return warnings;
 }
 
-export function createBestEffortLlmBindingPlan(stAdvanced: StAdvancedConfig): StPresetBindingPlan {
-	const preset = stAdvanced.rawPreset ?? {};
+export function createBestEffortLlmBindingPlan(stBase: StBaseConfig): StPresetBindingPlan {
+	const preset = stBase.rawPreset ?? {};
 	const warnings = [...listConnectionFieldWarnings(preset)];
 	const source = asString(preset.chat_completion_source);
 	const model = asString(preset.openai_model);

From 4a603051d6efdcff844aadd125cba35ac9ac3ba0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Wed, 11 Mar 2026 23:05:00 +0300
Subject: [PATCH 09/54] Add instruction kind split

---
 server/src/api/instructions.core.api.ts       |   9 +
 .../chat-core/built-in-sillytavern-preset.ts  | 245 +++++++
 .../services/chat-core/instruction-st-base.ts |  50 +-
 .../chat-core/instruction-st-preset.test.ts   |  40 +-
 shared/utils/sillytavern-preset.ts            |  87 +++
 web/src/api/instructions.ts                   |  11 +-
 .../features/sidebars/instructions/index.tsx  | 335 +++++----
 .../instructions/instruction-editor.tsx       | 636 ++++++++++--------
 web/src/i18n/resources/en/instructions.ts     |  40 +-
 web/src/i18n/resources/ru/instructions.ts     |  40 +-
 web/src/model/instructions/index.ts           |   8 +-
 web/src/model/instructions/st-preset.ts       |  63 +-
 12 files changed, 1082 insertions(+), 482 deletions(-)
 create mode 100644 server/src/services/chat-core/built-in-sillytavern-preset.ts
 create mode 100644 shared/utils/sillytavern-preset.ts

diff --git a/server/src/api/instructions.core.api.ts b/server/src/api/instructions.core.api.ts
index 85815ccc..16d2cdfa 100644
--- a/server/src/api/instructions.core.api.ts
+++ b/server/src/api/instructions.core.api.ts
@@ -23,6 +23,7 @@ import {
   buildInstructionRenderContext,
   resolveAndApplyWorldInfoToTemplateContext,
 } from "../services/chat-core/prompt-template-context";
+import { loadBuiltInSillyTavernPreset } from "../services/chat-core/instruction-st-base";
 import {
   renderLiquidTemplate,
   validateLiquidTemplate,
@@ -52,6 +53,14 @@ router.get(
   })
 );
 
+router.get(
+  "/instructions/default-st-preset",
+  asyncHandler(async () => {
+    const preset = await loadBuiltInSillyTavernPreset();
+    return { data: preset };
+  })
+);
+
 router.post(
   "/instructions/prerender",
   validate({ body: prerenderBodySchema }),
diff --git a/server/src/services/chat-core/built-in-sillytavern-preset.ts b/server/src/services/chat-core/built-in-sillytavern-preset.ts
new file mode 100644
index 00000000..71f54ee0
--- /dev/null
+++ b/server/src/services/chat-core/built-in-sillytavern-preset.ts
@@ -0,0 +1,245 @@
+export const BUILT_IN_SILLY_TAVERN_PRESET_FILE_NAME = "Default.json";
+
+export const BUILT_IN_SILLY_TAVERN_PRESET = {
+  "chat_completion_source": "openai",
+  "openai_model": "gpt-4-turbo",
+  "claude_model": "claude-sonnet-4-5",
+  "openrouter_model": "OR_Website",
+  "openrouter_use_fallback": false,
+  "openrouter_group_models": false,
+  "openrouter_sort_models": "alphabetically",
+  "ai21_model": "jamba-large",
+  "mistralai_model": "mistral-large-latest",
+  "chutes_model": "deepseek-ai/DeepSeek-V3-0324",
+  "chutes_sort_models": "alphabetically",
+  "electronhub_model": "gpt-4o-mini",
+  "electronhub_sort_models": "alphabetically",
+  "electronhub_group_models": false,
+  "custom_model": "",
+  "custom_url": "",
+  "custom_include_body": "",
+  "custom_exclude_body": "",
+  "custom_include_headers": "",
+  "google_model": "gemini-2.5-pro",
+  "vertexai_model": "gemini-2.5-pro",
+  "temperature": 1,
+  "frequency_penalty": 0,
+  "presence_penalty": 0,
+  "top_p": 1,
+  "top_k": 0,
+  "top_a": 0,
+  "min_p": 0,
+  "repetition_penalty": 1,
+  "openai_max_context": 4095,
+  "openai_max_tokens": 300,
+  "names_behavior": 0,
+  "send_if_empty": "",
+  "impersonation_prompt": "[Write your next reply from the point of view of {{user}}, using the chat history so far as a guideline for the writing style of {{user}}. Don't write as {{char}} or system. Don't describe actions of {{char}}.]",
+  "new_chat_prompt": "[Start a new Chat]",
+  "new_group_chat_prompt": "[Start a new group chat. Group members: {{group}}]",
+  "new_example_chat_prompt": "[Example Chat]",
+  "continue_nudge_prompt": "[Continue your last message without repeating its original content.]",
+  "bias_preset_selected": "Default (none)",
+  "reverse_proxy": "",
+  "proxy_password": "",
+  "max_context_unlocked": false,
+  "wi_format": "{0}",
+  "scenario_format": "{{scenario}}",
+  "personality_format": "{{personality}}",
+  "group_nudge_prompt": "[Write the next reply only as {{char}}.]",
+  "stream_openai": true,
+  "prompts": [
+    {
+      "name": "Main Prompt",
+      "system_prompt": true,
+      "role": "system",
+      "content": "Write {{char}}'s next reply in a fictional chat between {{char}} and {{user}}.",
+      "identifier": "main"
+    },
+    {
+      "name": "Auxiliary Prompt",
+      "system_prompt": true,
+      "role": "system",
+      "content": "",
+      "identifier": "nsfw"
+    },
+    {
+      "identifier": "dialogueExamples",
+      "name": "Chat Examples",
+      "system_prompt": true,
+      "marker": true
+    },
+    {
+      "name": "Post-History Instructions",
+      "system_prompt": true,
+      "role": "system",
+      "content": "",
+      "identifier": "jailbreak"
+    },
+    {
+      "identifier": "chatHistory",
+      "name": "Chat History",
+      "system_prompt": true,
+      "marker": true
+    },
+    {
+      "identifier": "worldInfoAfter",
+      "name": "World Info (after)",
+      "system_prompt": true,
+      "marker": true
+    },
+    {
+      "identifier": "worldInfoBefore",
+      "name": "World Info (before)",
+      "system_prompt": true,
+      "marker": true
+    },
+    {
+      "identifier": "enhanceDefinitions",
+      "role": "system",
+      "name": "Enhance Definitions",
+      "content": "If you have more knowledge of {{char}}, add to the character's lore and personality to enhance them but keep the Character Sheet's definitions absolute.",
+      "system_prompt": true,
+      "marker": false
+    },
+    {
+      "identifier": "charDescription",
+      "name": "Char Description",
+      "system_prompt": true,
+      "marker": true
+    },
+    {
+      "identifier": "charPersonality",
+      "name": "Char Personality",
+      "system_prompt": true,
+      "marker": true
+    },
+    {
+      "identifier": "scenario",
+      "name": "Scenario",
+      "system_prompt": true,
+      "marker": true
+    },
+    {
+      "identifier": "personaDescription",
+      "name": "Persona Description",
+      "system_prompt": true,
+      "marker": true
+    }
+  ],
+  "prompt_order": [
+    {
+      "character_id": 100000,
+      "order": [
+        {
+          "identifier": "main",
+          "enabled": true
+        },
+        {
+          "identifier": "worldInfoBefore",
+          "enabled": true
+        },
+        {
+          "identifier": "charDescription",
+          "enabled": true
+        },
+        {
+          "identifier": "charPersonality",
+          "enabled": true
+        },
+        {
+          "identifier": "scenario",
+          "enabled": true
+        },
+        {
+          "identifier": "enhanceDefinitions",
+          "enabled": false
+        },
+        {
+          "identifier": "nsfw",
+          "enabled": true
+        },
+        {
+          "identifier": "worldInfoAfter",
+          "enabled": true
+        },
+        {
+          "identifier": "dialogueExamples",
+          "enabled": true
+        },
+        {
+          "identifier": "chatHistory",
+          "enabled": true
+        },
+        {
+          "identifier": "jailbreak",
+          "enabled": true
+        }
+      ]
+    },
+    {
+      "character_id": 100001,
+      "order": [
+        {
+          "identifier": "main",
+          "enabled": true
+        },
+        {
+          "identifier": "worldInfoBefore",
+          "enabled": true
+        },
+        {
+          "identifier": "personaDescription",
+          "enabled": true
+        },
+        {
+          "identifier": "charDescription",
+          "enabled": true
+        },
+        {
+          "identifier": "charPersonality",
+          "enabled": true
+        },
+        {
+          "identifier": "scenario",
+          "enabled": true
+        },
+        {
+          "identifier": "enhanceDefinitions",
+          "enabled": false
+        },
+        {
+          "identifier": "nsfw",
+          "enabled": true
+        },
+        {
+          "identifier": "worldInfoAfter",
+          "enabled": true
+        },
+        {
+          "identifier": "dialogueExamples",
+          "enabled": true
+        },
+        {
+          "identifier": "chatHistory",
+          "enabled": true
+        },
+        {
+          "identifier": "jailbreak",
+          "enabled": true
+        }
+      ]
+    }
+  ],
+  "show_external_models": false,
+  "assistant_prefill": "",
+  "assistant_impersonation": "",
+  "use_sysprompt": false,
+  "squash_system_messages": false,
+  "media_inlining": true,
+  "bypass_status_check": false,
+  "continue_prefill": false,
+  "continue_postfix": " ",
+  "seed": -1,
+  "n": 1
+} as const;
diff --git a/server/src/services/chat-core/instruction-st-base.ts b/server/src/services/chat-core/instruction-st-base.ts
index 0b5832bd..a8e7c388 100644
--- a/server/src/services/chat-core/instruction-st-base.ts
+++ b/server/src/services/chat-core/instruction-st-base.ts
@@ -1,4 +1,13 @@
 import { renderLiquidTemplate } from "./prompt-template-renderer";
+import {
+  BUILT_IN_SILLY_TAVERN_PRESET,
+  BUILT_IN_SILLY_TAVERN_PRESET_FILE_NAME,
+} from "./built-in-sillytavern-preset";
+import {
+  isSillyTavernPreset,
+  getSillyTavernPresetValidationError,
+  SILLY_TAVERN_PREFERRED_CHARACTER_ID,
+} from "@shared/utils/sillytavern-preset";
 
 import type { InstructionRenderContext } from "./prompt-template-renderer";
 import type {
@@ -8,17 +17,6 @@ import type {
   StBaseResponseConfig,
 } from "@shared/types/instructions";
 
-const PROMPT_ORDER_PREFERRED_CHARACTER_ID = 100001;
-
-const ST_PRESET_DETECT_KEYS = new Set([
-  "chat_completion_source",
-  "prompts",
-  "prompt_order",
-  "openai_max_tokens",
-  "openai_model",
-  "temperature",
-]);
-
 export const ST_SENSITIVE_FIELDS = [
   "reverse_proxy",
   "proxy_password",
@@ -155,9 +153,7 @@ function normalizePromptOrderItem(value: unknown): StBasePromptOrder | null {
 export function detectStChatCompletionPreset(
   input: unknown
 ): input is Record<string, unknown> {
-  if (!isRecord(input)) return false;
-  if (input.type === "talespinner.instruction") return false;
-  return Object.keys(input).some((key) => ST_PRESET_DETECT_KEYS.has(key));
+  return isSillyTavernPreset(input);
 }
 
 export function stripSensitiveFieldsFromPreset(
@@ -232,7 +228,7 @@ function resolvePreferredPromptOrderEntries(
   if (promptOrder.length === 0) return [];
   const preferred =
     promptOrder.find(
-      (item) => item.character_id === PROMPT_ORDER_PREFERRED_CHARACTER_ID
+      (item) => item.character_id === SILLY_TAVERN_PREFERRED_CHARACTER_ID
     ) ?? promptOrder[0];
   return preferred.order;
 }
@@ -322,6 +318,11 @@ export function createStBaseConfigFromPreset(params: {
   fileName: string;
   sensitiveImportMode: SensitiveImportMode;
 }): StBaseConfig {
+  const validationError = getSillyTavernPresetValidationError(params.preset);
+  if (validationError) {
+    throw new Error(validationError);
+  }
+
   const rawPreset =
     params.sensitiveImportMode === "remove"
       ? stripSensitiveFieldsFromPreset(params.preset)
@@ -342,6 +343,25 @@ export function createStBaseConfigFromPreset(params: {
   };
 }
 
+export async function loadBuiltInSillyTavernPreset(): Promise<{
+  fileName: string;
+  preset: Record<string, unknown>;
+}> {
+  const parsed = structuredClone(BUILT_IN_SILLY_TAVERN_PRESET) as unknown;
+  const validationError = getSillyTavernPresetValidationError(parsed);
+
+  if (validationError || !isSillyTavernPreset(parsed)) {
+    throw new Error(
+      `Built-in SillyTavern preset is invalid: ${validationError ?? "Unknown validation error."}`
+    );
+  }
+
+  return {
+    fileName: BUILT_IN_SILLY_TAVERN_PRESET_FILE_NAME,
+    preset: parsed,
+  };
+}
+
 export async function resolveStBaseInstructionRuntime(params: {
   stBase: StBaseConfig;
   context: InstructionRenderContext;
diff --git a/server/src/services/chat-core/instruction-st-preset.test.ts b/server/src/services/chat-core/instruction-st-preset.test.ts
index f62d53ad..2663aa39 100644
--- a/server/src/services/chat-core/instruction-st-preset.test.ts
+++ b/server/src/services/chat-core/instruction-st-preset.test.ts
@@ -3,6 +3,7 @@ import { describe, expect, test } from "vitest";
 import {
   createStBaseConfigFromPreset,
   detectStChatCompletionPreset,
+  loadBuiltInSillyTavernPreset,
   resolveStBaseInstructionRuntime,
   stripSensitiveFieldsFromPreset,
 } from "./instruction-st-base";
@@ -61,6 +62,8 @@ describe("instruction-st-base", () => {
       detectStChatCompletionPreset({
         chat_completion_source: "openai",
         openai_model: "gpt-4-turbo",
+        prompts: [{ identifier: "main" }],
+        prompt_order: [{ character_id: 100001, order: [] }],
       })
     ).toBe(true);
 
@@ -69,6 +72,39 @@ describe("instruction-st-base", () => {
         type: "talespinner.instruction",
       })
     ).toBe(false);
+
+    expect(
+      detectStChatCompletionPreset({
+        temperature: 0.8,
+      })
+    ).toBe(false);
+
+    expect(
+      detectStChatCompletionPreset({
+        openai_model: "gpt-4-turbo",
+        prompts: [{ identifier: "main" }],
+      })
+    ).toBe(false);
+  });
+
+  test("loads built-in Default.json preset", async () => {
+    const builtInPreset = await loadBuiltInSillyTavernPreset();
+
+    expect(builtInPreset.fileName).toBe("Default.json");
+    expect(detectStChatCompletionPreset(builtInPreset.preset)).toBe(true);
+
+    const normalized = createStBaseConfigFromPreset({
+      preset: builtInPreset.preset,
+      fileName: builtInPreset.fileName,
+      sensitiveImportMode: "keep",
+    });
+
+    expect(normalized.prompts.length).toBeGreaterThan(0);
+    expect(normalized.promptOrder.length).toBeGreaterThan(0);
+    expect(normalized.rawPreset.prompts).toEqual(builtInPreset.preset.prompts);
+    expect(normalized.rawPreset.prompt_order).toEqual(
+      builtInPreset.preset.prompt_order
+    );
   });
 
   test("strips sensitive fields", () => {
@@ -92,8 +128,8 @@ describe("instruction-st-base", () => {
       openai_max_tokens: 512,
       openai_model: "gpt-4-turbo",
       custom_url: "https://proxy.local/v1",
-      prompts: [],
-      prompt_order: [],
+      prompts: [{ identifier: "main", role: "system", content: "Main" }],
+      prompt_order: [{ character_id: 100001, order: [{ identifier: "main", enabled: true }] }],
     };
 
     const removed = createStBaseConfigFromPreset({
diff --git a/shared/utils/sillytavern-preset.ts b/shared/utils/sillytavern-preset.ts
new file mode 100644
index 00000000..175afdb1
--- /dev/null
+++ b/shared/utils/sillytavern-preset.ts
@@ -0,0 +1,87 @@
+const SILLY_TAVERN_ROOT_HINT_KEYS = [
+  "chat_completion_source",
+  "openai_model",
+  "claude_model",
+  "openrouter_model",
+  "google_model",
+  "mistralai_model",
+  "custom_model",
+  "custom_url",
+  "temperature",
+  "openai_max_tokens",
+] as const;
+
+export const SILLY_TAVERN_PROMPT_IDENTIFIER_PATTERN = /^[A-Za-z0-9._-]+$/;
+
+export const SILLY_TAVERN_PREFERRED_CHARACTER_ID = 100001;
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function hasOwn(
+  value: Record<string, unknown>,
+  key: string
+): boolean {
+  return Object.prototype.hasOwnProperty.call(value, key);
+}
+
+function isNonEmptyString(value: unknown): value is string {
+  return typeof value === "string" && value.trim().length > 0;
+}
+
+function isFiniteInteger(value: unknown): value is number {
+  return typeof value === "number" && Number.isInteger(value) && Number.isFinite(value);
+}
+
+function isValidPromptObject(value: unknown): boolean {
+  return isPlainObject(value) && isNonEmptyString(value.identifier);
+}
+
+function isValidPromptOrderObject(value: unknown): boolean {
+  return isPlainObject(value) && isFiniteInteger(value.character_id);
+}
+
+export function getSillyTavernPresetValidationError(input: unknown): string | null {
+  if (!isPlainObject(input)) {
+    return "Preset must be a plain JSON object.";
+  }
+
+  if (input.type === "talespinner.instruction") {
+    return "TaleSpinner instruction export is not a SillyTavern preset.";
+  }
+
+  if (!Array.isArray(input.prompts)) {
+    return 'SillyTavern preset must contain a "prompts" array.';
+  }
+
+  if (!Array.isArray(input.prompt_order)) {
+    return 'SillyTavern preset must contain a "prompt_order" array.';
+  }
+
+  if (!input.prompts.some(isValidPromptObject)) {
+    return 'SillyTavern preset must contain at least one prompt with a non-empty "identifier".';
+  }
+
+  if (!input.prompt_order.some(isValidPromptOrderObject)) {
+    return 'SillyTavern preset must contain at least one prompt_order item with an integer "character_id".';
+  }
+
+  const hasRootHint = SILLY_TAVERN_ROOT_HINT_KEYS.some((key) => hasOwn(input, key));
+  if (!hasRootHint) {
+    return "SillyTavern preset must contain at least one known root hint field.";
+  }
+
+  return null;
+}
+
+export function isSillyTavernPreset(
+  input: unknown
+): input is Record<string, unknown> {
+  return getSillyTavernPresetValidationError(input) === null;
+}
+
+export function isValidSillyTavernPromptIdentifier(identifier: string): boolean {
+  return SILLY_TAVERN_PROMPT_IDENTIFIER_PATTERN.test(identifier);
+}
+
diff --git a/web/src/api/instructions.ts b/web/src/api/instructions.ts
index a503cf57..5efdfdaf 100644
--- a/web/src/api/instructions.ts
+++ b/web/src/api/instructions.ts
@@ -28,6 +28,11 @@ export type StBaseInstructionDto = InstructionDtoBase & {
 
 export type InstructionDto = BasicInstructionDto | StBaseInstructionDto;
 
+export type DefaultStPresetDto = {
+	fileName: string;
+	preset: Record<string, unknown>;
+};
+
 export async function listInstructions(params?: { ownerId?: string }): Promise<InstructionDto[]> {
 	const query = new URLSearchParams();
 	if (typeof params?.ownerId === 'string') query.set('ownerId', params.ownerId);
@@ -35,6 +40,10 @@ export async function listInstructions(params?: { ownerId?: string }): Promise<I
 	return apiJson<InstructionDto[]>(`/instructions${suffix}`);
 }
 
+export async function getDefaultStPreset(): Promise<DefaultStPresetDto> {
+	return apiJson<DefaultStPresetDto>('/instructions/default-st-preset');
+}
+
 export async function createInstruction(params: {
 	name: string;
 	engine?: 'liquidjs';
@@ -87,7 +96,7 @@ export type CreateInstructionDraft =
 	  };
 
 export function getInstructionKindLabel(kind: InstructionKind): string {
-	return kind === 'st_base' ? 'st-base' : 'basic';
+	return kind === 'st_base' ? 'SillyTavern-like' : 'Simple';
 }
 
 export async function deleteInstruction(id: string): Promise<{ id: string }> {
diff --git a/web/src/features/sidebars/instructions/index.tsx b/web/src/features/sidebars/instructions/index.tsx
index 0f5b6821..b703dae3 100644
--- a/web/src/features/sidebars/instructions/index.tsx
+++ b/web/src/features/sidebars/instructions/index.tsx
@@ -1,19 +1,11 @@
-import { Badge, Button, Group, Modal, Select, Stack, Text, TextInput } from '@mantine/core';
+import { Button, Group, Modal, Select, Stack, Text, TextInput } from '@mantine/core';
 import { useUnit } from 'effector-react';
 import { type ChangeEvent, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import {
-	LuDownload,
-	LuLink2,
-	LuLink2Off,
-	LuPencil,
-	LuPlus,
-	LuSave,
-	LuTrash2,
-	LuUpload,
-} from 'react-icons/lu';
+import { LuDownload, LuLink2, LuLink2Off, LuPencil, LuPlus, LuSave, LuTrash2, LuUpload } from 'react-icons/lu';
 
 import { getRuntime, patchRuntime } from '../../../api/llm';
+import { getDefaultStPreset } from '../../../api/instructions';
 import { $appSettings, updateAppSettings } from '@model/app-settings';
 import {
 	$instructionEditorDraft,
@@ -27,9 +19,9 @@ import {
 import {
 	buildStPresetFromStBase,
 	createBestEffortLlmBindingPlan,
-	createDefaultStBaseConfig,
 	createStBaseConfigFromPreset,
 	detectStChatCompletionPreset,
+	getStPresetValidationError,
 	hasSensitivePresetFields,
 } from '@model/instructions/st-preset';
 import { Drawer } from '@ui/drawer';
@@ -55,6 +47,11 @@ type PendingSensitiveImport = {
 	json: Record<string, unknown>;
 };
 
+type CreateDialogState = {
+	kind: 'basic' | 'st_base' | null;
+	name: string;
+};
+
 type InstructionViewState =
 	| {
 			kind: 'basic';
@@ -168,9 +165,8 @@ function createInstructionPayloadFromState(params: InstructionViewState): Create
 	};
 }
 
-function createInstructionLabel(item: InstructionDto, t: (key: string) => string): string {
-	const kindLabel = item.kind === 'st_base' ? t('instructions.kinds.stBase') : t('instructions.kinds.basic');
-	return `${item.name} · ${kindLabel}`;
+function createInstructionLabel(item: InstructionDto): string {
+	return item.name;
 }
 
 export const InstructionsSidebar = () => {
@@ -187,6 +183,10 @@ export const InstructionsSidebar = () => {
 	]);
 
 	const [createOpened, setCreateOpened] = useState(false);
+	const [createDialog, setCreateDialog] = useState<CreateDialogState>({
+		kind: null,
+		name: '',
+	});
 	const [nameDialog, setNameDialog] = useState<NameDialogState | null>(null);
 	const [deleteOpened, setDeleteOpened] = useState(false);
 	const [discardOpened, setDiscardOpened] = useState(false);
@@ -198,7 +198,7 @@ export const InstructionsSidebar = () => {
 	const usedNames = useMemo(() => new Set(items.map((item) => item.name)), [items]);
 	const options = items
 		.filter((item) => typeof item.id === 'string' && item.id.trim().length > 0)
-		.map((item) => ({ value: item.id, label: createInstructionLabel(item, t) }));
+		.map((item) => ({ value: item.id, label: createInstructionLabel(item) }));
 
 	const currentValues = useMemo<InstructionViewState | null>(() => {
 		if (draft && selectedInstruction && draft.sourceInstructionId === selectedInstruction.id) {
@@ -334,26 +334,70 @@ export const InstructionsSidebar = () => {
 		}
 	};
 
-	const handleCreate = async (kind: 'basic' | 'st_base') => {
+	const openCreateDialog = () => {
+		setCreateDialog({
+			kind: null,
+			name: resolveUniqueName(t('instructions.defaults.newPreset'), usedNames),
+		});
+		setCreateOpened(true);
+	};
+
+	const handleCreateBasic = async (name: string): Promise<boolean> => {
 		try {
 			const created = await onCreateInstruction(
-				kind === 'st_base'
-					? {
-							kind: 'st_base',
-							name: resolveUniqueName(t('instructions.defaults.newStBaseInstruction'), usedNames),
-							stBase: createDefaultStBaseConfig(),
-					  }
-					: {
-							kind: 'basic',
-							name: resolveUniqueName(t('instructions.defaults.newInstruction'), usedNames),
-							templateText: '{{char.name}}',
-					  }
+				{
+					kind: 'basic',
+					name: resolveUniqueName(name, usedNames),
+					templateText: '{{char.name}}',
+				}
 			);
 			await applyBestEffortBinding(created);
-			setCreateOpened(false);
 			toaster.success({ title: t('instructions.toasts.createdTitle'), description: created.name });
+			return true;
 		} catch {
 			// handled by model watcher
+			return false;
+		}
+	};
+
+	const createSillyTavernLikeInstruction = async (name: string): Promise<boolean> => {
+		try {
+			const defaultPreset = await getDefaultStPreset();
+			const stBase = createStBaseConfigFromPreset({
+				preset: defaultPreset.preset,
+				fileName: defaultPreset.fileName,
+				sensitiveImportMode: 'keep',
+			});
+			const created = await onCreateInstruction({
+				kind: 'st_base',
+				name: resolveUniqueName(name, usedNames),
+				stBase,
+			});
+			await applyBestEffortBinding(created);
+			toaster.success({ title: t('instructions.toasts.createdTitle'), description: created.name });
+			return true;
+		} catch (error) {
+			toaster.error({
+				title: t('instructions.toasts.createErrorTitle'),
+				description: error instanceof Error ? error.message : String(error),
+			});
+			return false;
+		}
+	};
+
+	const handleCreateSubmit = async () => {
+		const nextName = createDialog.name.trim();
+		if (!createDialog.kind || !nextName) return;
+
+		let created = false;
+		if (createDialog.kind === 'basic') {
+			created = await handleCreateBasic(nextName);
+		} else {
+			created = await createSillyTavernLikeInstruction(nextName);
+		}
+
+		if (created) {
+			setCreateOpened(false);
 		}
 	};
 
@@ -453,7 +497,8 @@ export const InstructionsSidebar = () => {
 					return;
 				}
 
-				if (detectStChatCompletionPreset(json)) {
+				const stPresetValidationError = getStPresetValidationError(json);
+				if (!stPresetValidationError && detectStChatCompletionPreset(json)) {
 					if (hasSensitivePresetFields(json)) {
 						setPendingSensitiveImport({ fileName: file.name, json });
 						return;
@@ -465,7 +510,7 @@ export const InstructionsSidebar = () => {
 
 				toaster.error({
 					title: t('instructions.toasts.importErrorTitle'),
-					description: t('instructions.toasts.importReadError'),
+					description: stPresetValidationError ?? t('instructions.toasts.importReadError'),
 				});
 			} catch (error) {
 				toaster.error({
@@ -484,10 +529,55 @@ export const InstructionsSidebar = () => {
 			<Stack gap="md">
 				<input type="file" ref={fileInputRef} style={{ display: 'none' }} accept=".json,.settings" onChange={handleFileChange} />
 
-				<Modal opened={createOpened} onClose={() => setCreateOpened(false)} title={t('instructions.dialogs.createTitle')} centered>
+				<Modal
+					opened={createOpened}
+					onClose={() => setCreateOpened(false)}
+					title={t('instructions.dialogs.createTitle')}
+					centered
+				>
 					<Stack gap="md">
-						<Button onClick={() => void handleCreate('basic')}>{t('instructions.actions.createBasic')}</Button>
-						<Button variant="light" onClick={() => void handleCreate('st_base')}>{t('instructions.actions.createStBase')}</Button>
+						<Select
+							label={t('instructions.fields.createInstructionType')}
+							placeholder={t('instructions.placeholders.createInstructionType')}
+							value={createDialog.kind}
+							onChange={(value) =>
+								setCreateDialog((current) => ({
+									...current,
+									kind: (value as CreateDialogState['kind']) ?? null,
+								}))
+							}
+							data={[
+								{ value: 'basic', label: t('instructions.actions.createBasic') },
+								{ value: 'st_base', label: t('instructions.actions.createStBase') },
+							]}
+							allowDeselect
+						/>
+						<TextInput
+							label={t('instructions.fields.name')}
+							value={createDialog.name}
+							onChange={(event) =>
+								setCreateDialog((current) => ({
+									...current,
+									name: event.currentTarget.value,
+								}))
+							}
+							placeholder={t('instructions.placeholders.name')}
+						/>
+						{createDialog.kind && (
+							<Text size="sm" c="dimmed">
+								{createDialog.kind === 'basic'
+									? t('instructions.dialogs.createBasicHelp')
+									: t('instructions.dialogs.createStBaseHelp')}
+							</Text>
+						)}
+						<Group justify="flex-end">
+							<Button variant="default" onClick={() => setCreateOpened(false)}>
+								{t('common.cancel')}
+							</Button>
+							<Button onClick={() => void handleCreateSubmit()} disabled={!createDialog.kind || !createDialog.name.trim()}>
+								{t('instructions.actions.create')}
+							</Button>
+						</Group>
 					</Stack>
 				</Modal>
 
@@ -604,103 +694,88 @@ export const InstructionsSidebar = () => {
 				</Modal>
 
 				<Stack gap="xs">
-					<Group justify="space-between" wrap="nowrap">
-						<Text fw={700}>{t('instructions.presets.title')}</Text>
-						<Group gap="xs" wrap="nowrap">
-							<IconButtonWithTooltip
-								tooltip={t('instructions.actions.create')}
-								icon={<LuPlus size={16} />}
-								aria-label={t('instructions.actions.create')}
-								onClick={() => setCreateOpened(true)}
-							/>
-							<IconButtonWithTooltip
-								tooltip={
-									appSettings.bindChatCompletionPresetToConnection
-										? t('instructions.presets.actions.unbind')
-										: t('instructions.presets.actions.bind')
-								}
-								icon={
-									appSettings.bindChatCompletionPresetToConnection ? (
-										<LuLink2 size={16} />
-									) : (
-										<LuLink2Off size={16} />
-									)
-								}
-								aria-label={t('instructions.presets.actions.bind')}
-								variant={appSettings.bindChatCompletionPresetToConnection ? 'solid' : 'subtle'}
-								onClick={() =>
-									updateAppSettings({
-										bindChatCompletionPresetToConnection: !appSettings.bindChatCompletionPresetToConnection,
-									})
-								}
-							/>
-							<IconButtonWithTooltip
-								tooltip={t('instructions.presets.actions.import')}
-								icon={<LuUpload size={16} />}
-								aria-label={t('instructions.presets.actions.import')}
-								onClick={() => fileInputRef.current?.click()}
-							/>
-							<IconButtonWithTooltip
-								tooltip={t('instructions.presets.actions.export')}
-								icon={<LuDownload size={16} />}
-								aria-label={t('instructions.presets.actions.export')}
-								disabled={currentValues?.kind !== 'st_base'}
-								onClick={handleExport}
-							/>
-							<IconButtonWithTooltip
-								tooltip={t('instructions.presets.actions.delete')}
-								icon={<LuTrash2 size={16} />}
-								aria-label={t('instructions.presets.actions.delete')}
-								color="red"
-								variant="outline"
-								disabled={!selectedInstruction}
-								onClick={() => setDeleteOpened(true)}
-							/>
-						</Group>
-					</Group>
-
-					<Group gap="sm" wrap="nowrap" align="flex-end">
-						<Select
-							data={options}
-							value={selectedValue}
-							onChange={(id) => {
-								if (!id || id === selectedValue) return;
-								if (hasUnsavedChanges) {
-									setPendingSelectionId(id);
-									setDiscardOpened(true);
-									return;
-								}
-								void applySelection(id);
-							}}
-							placeholder={t('instructions.placeholders.selectInstruction')}
-							comboboxProps={{ withinPortal: false }}
-							className="ts-sidebar-toolbar__main"
-							style={{ flex: 1 }}
+					<Select
+						data={options}
+						value={selectedValue}
+						onChange={(id) => {
+							if (!id || id === selectedValue) return;
+							if (hasUnsavedChanges) {
+								setPendingSelectionId(id);
+								setDiscardOpened(true);
+								return;
+							}
+							void applySelection(id);
+						}}
+						placeholder={t('instructions.placeholders.selectInstruction')}
+						comboboxProps={{ withinPortal: false }}
+						className="ts-sidebar-toolbar__main"
+					/>
+
+					<Group justify="flex-end" gap="xs" wrap="wrap">
+						<IconButtonWithTooltip
+							tooltip={t('instructions.actions.create')}
+							icon={<LuPlus size={16} />}
+							aria-label={t('instructions.actions.create')}
+							onClick={openCreateDialog}
+						/>
+						<IconButtonWithTooltip
+							tooltip={
+								appSettings.bindChatCompletionPresetToConnection
+									? t('instructions.presets.actions.unbind')
+									: t('instructions.presets.actions.bind')
+							}
+							icon={
+								appSettings.bindChatCompletionPresetToConnection ? (
+									<LuLink2 size={16} />
+								) : (
+									<LuLink2Off size={16} />
+								)
+							}
+							aria-label={t('instructions.presets.actions.bind')}
+							variant={appSettings.bindChatCompletionPresetToConnection ? 'solid' : 'subtle'}
+							onClick={() =>
+								updateAppSettings({
+									bindChatCompletionPresetToConnection: !appSettings.bindChatCompletionPresetToConnection,
+								})
+							}
+						/>
+						<IconButtonWithTooltip
+							tooltip={t('instructions.presets.actions.import')}
+							icon={<LuUpload size={16} />}
+							aria-label={t('instructions.presets.actions.import')}
+							onClick={() => fileInputRef.current?.click()}
+						/>
+						<IconButtonWithTooltip
+							tooltip={t('instructions.presets.actions.export')}
+							icon={<LuDownload size={16} />}
+							aria-label={t('instructions.presets.actions.export')}
+							disabled={currentValues?.kind !== 'st_base'}
+							onClick={handleExport}
+						/>
+						<IconButtonWithTooltip
+							tooltip={t('instructions.presets.actions.delete')}
+							icon={<LuTrash2 size={16} />}
+							aria-label={t('instructions.presets.actions.delete')}
+							color="red"
+							variant="outline"
+							disabled={!selectedInstruction}
+							onClick={() => setDeleteOpened(true)}
+						/>
+						<IconButtonWithTooltip
+							tooltip={t('instructions.actions.updateCurrent')}
+							icon={<LuSave size={16} />}
+							aria-label={t('instructions.actions.updateCurrent')}
+							variant="solid"
+							disabled={!selectedInstruction || !hasUnsavedChanges}
+							onClick={() => void handleUpdateCurrent()}
+						/>
+						<IconButtonWithTooltip
+							tooltip={t('instructions.actions.rename')}
+							icon={<LuPencil size={16} />}
+							aria-label={t('instructions.actions.rename')}
+							disabled={!selectedInstruction}
+							onClick={promptForRename}
 						/>
-
-						{selectedInstruction && (
-							<Badge variant="light">
-								{selectedInstruction.kind === 'st_base' ? t('instructions.kinds.stBase') : t('instructions.kinds.basic')}
-							</Badge>
-						)}
-
-						<Group gap="xs" wrap="nowrap">
-							<IconButtonWithTooltip
-								tooltip={t('instructions.actions.updateCurrent')}
-								icon={<LuSave size={16} />}
-								aria-label={t('instructions.actions.updateCurrent')}
-								variant="solid"
-								disabled={!selectedInstruction || !hasUnsavedChanges}
-								onClick={() => void handleUpdateCurrent()}
-							/>
-							<IconButtonWithTooltip
-								tooltip={t('instructions.actions.rename')}
-								icon={<LuPencil size={16} />}
-								aria-label={t('instructions.actions.rename')}
-								disabled={!selectedInstruction}
-								onClick={promptForRename}
-							/>
-						</Group>
 					</Group>
 				</Stack>
 
diff --git a/web/src/features/sidebars/instructions/instruction-editor.tsx b/web/src/features/sidebars/instructions/instruction-editor.tsx
index 5c0b15f1..ba039ffe 100644
--- a/web/src/features/sidebars/instructions/instruction-editor.tsx
+++ b/web/src/features/sidebars/instructions/instruction-editor.tsx
@@ -1,41 +1,36 @@
-import { Accordion, Alert, Badge, Button, Collapse, Group, NumberInput, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
+import { Accordion, Alert, Button, Collapse, Group, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
 import { useUnit } from 'effector-react';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { LuArrowDown, LuArrowUp, LuChevronDown, LuChevronRight, LuPlus, LuTrash2 } from 'react-icons/lu';
 
 import { $currentBranchId, $currentChat, $currentEntityProfile } from '@model/chat-core';
+import { $selectedInstruction, instructionEditorDraftChanged } from '@model/instructions';
 import {
-	$selectedInstruction,
-	instructionEditorDraftChanged,
-} from '@model/instructions';
-import {
-	createDefaultStBaseConfig,
+	createEmptyStBaseConfig,
 	getStPromptDefinition,
 	getStPromptSourceLabel,
 	isSystemMarkerPrompt,
 	resolvePreferredPromptOrder,
+	ST_SYSTEM_PROMPT_DEFAULTS,
 } from '@model/instructions/st-preset';
 import { LiquidDocsButton } from '@ui/liquid-template-docs';
+import { isValidSillyTavernPromptIdentifier } from '@shared/utils/sillytavern-preset';
 
 import { prerenderInstruction } from '../../../api/instructions';
 
 import type { StBaseConfig, StBasePrompt } from '@shared/types/instructions';
 
-const KNOWN_PROMPT_IDENTIFIERS = [
-	'main',
-	'nsfw',
-	'jailbreak',
-	'worldInfoBefore',
-	'worldInfoAfter',
-	'charDescription',
-	'charPersonality',
-	'scenario',
-	'personaDescription',
-	'dialogueExamples',
-	'chatHistory',
-	'enhanceDefinitions',
-];
+type CustomPromptDraft = {
+	identifier: string;
+	name: string;
+	role: 'system' | 'user' | 'assistant';
+	system_prompt: boolean;
+	marker: boolean;
+	content: string;
+};
+
+const STANDARD_PROMPT_IDENTIFIERS = ST_SYSTEM_PROMPT_DEFAULTS.map((item) => item.identifier);
 
 function normalizePromptForEdit(prompt: StBasePrompt | undefined, identifier: string): StBasePrompt {
 	if (prompt) return { ...prompt };
@@ -50,6 +45,28 @@ function normalizePromptForEdit(prompt: StBasePrompt | undefined, identifier: st
 	};
 }
 
+function createEmptyCustomPromptDraft(): CustomPromptDraft {
+	return {
+		identifier: '',
+		name: '',
+		role: 'system',
+		system_prompt: true,
+		marker: false,
+		content: '',
+	};
+}
+
+function isCustomPrompt(identifier: string): boolean {
+	return !STANDARD_PROMPT_IDENTIFIERS.includes(identifier);
+}
+
+function formatPromptMeta(prompt: StBasePrompt, t: (key: string) => string): string {
+	const parts: string[] = [prompt.role ?? 'system'];
+	if (prompt.system_prompt) parts.push('system_prompt');
+	if (prompt.marker) parts.push(t('instructions.fields.markerLabel'));
+	return parts.join(' · ');
+}
+
 export const InstructionEditor = () => {
 	const { t } = useTranslation();
 	const instruction = useUnit($selectedInstruction);
@@ -57,7 +74,10 @@ export const InstructionEditor = () => {
 
 	const [basicTemplateText, setBasicTemplateText] = useState('');
 	const [stBase, setStBase] = useState<StBaseConfig | null>(null);
-	const [newPromptIdentifier, setNewPromptIdentifier] = useState<string | null>(null);
+	const [addBlockOpened, setAddBlockOpened] = useState(false);
+	const [newStandardPromptIdentifier, setNewStandardPromptIdentifier] = useState<string | null>(null);
+	const [customPromptDraft, setCustomPromptDraft] = useState<CustomPromptDraft>(createEmptyCustomPromptDraft);
+	const [customPromptError, setCustomPromptError] = useState<string | null>(null);
 	const [collapsedPromptById, setCollapsedPromptById] = useState<Record<string, boolean>>({});
 
 	const [preview, setPreview] = useState('');
@@ -86,7 +106,10 @@ export const InstructionEditor = () => {
 			setBasicTemplateText('');
 			setStBase(structuredClone(nextInstruction.stBase));
 		}
-		setNewPromptIdentifier(null);
+		setAddBlockOpened(false);
+		setNewStandardPromptIdentifier(null);
+		setCustomPromptDraft(createEmptyCustomPromptDraft());
+		setCustomPromptError(null);
 		setCollapsedPromptById({});
 		setPreview('');
 		setPreviewError(null);
@@ -113,7 +136,7 @@ export const InstructionEditor = () => {
 			sourceInstructionId: instruction.id,
 			kind: 'st_base',
 			name: instruction.name,
-			stBase: stBase ?? createDefaultStBaseConfig(),
+			stBase: stBase ?? createEmptyStBaseConfig(),
 			meta: instruction.meta ?? undefined,
 		});
 	}, [basicTemplateText, instruction, stBase]);
@@ -133,7 +156,7 @@ export const InstructionEditor = () => {
 
 	const addablePromptIdentifiers = useMemo(() => {
 		const used = new Set(preferredOrder?.order.map((item) => item.identifier) ?? []);
-		return KNOWN_PROMPT_IDENTIFIERS.filter((identifier) => !used.has(identifier));
+		return STANDARD_PROMPT_IDENTIFIERS.filter((identifier) => !used.has(identifier));
 	}, [preferredOrder?.order]);
 
 	const rawPresetJson = useMemo(() => {
@@ -160,7 +183,11 @@ export const InstructionEditor = () => {
 		}));
 	};
 
-	const updatePreferredOrder = (updater: (order: Array<{ identifier: string; enabled: boolean }>) => Array<{ identifier: string; enabled: boolean }>) => {
+	const updatePreferredOrder = (
+		updater: (
+			order: Array<{ identifier: string; enabled: boolean }>
+		) => Array<{ identifier: string; enabled: boolean }>
+	) => {
 		setStBase((current) => {
 			if (!current) return current;
 			const selectedOrder = resolvePreferredPromptOrder(current);
@@ -185,93 +212,126 @@ export const InstructionEditor = () => {
 		});
 	};
 
-	const setPromptContent = (identifier: string, content: string) => {
+	const upsertPrompt = (prompt: StBasePrompt) => {
 		setStBase((current) => {
 			if (!current) return current;
-			const index = current.prompts.findIndex((item) => item.identifier === identifier);
+			const index = current.prompts.findIndex((item) => item.identifier === prompt.identifier);
 			if (index >= 0) {
 				const prompts = [...current.prompts];
-				prompts[index] = {
-					...prompts[index],
-					content,
-				};
+				prompts[index] = { ...prompts[index], ...prompt };
 				return { ...current, prompts };
 			}
 			return {
 				...current,
-				prompts: [
-					...current.prompts,
-					{
-						identifier,
-						name: identifier,
-						role: 'system',
-						system_prompt: true,
-						content,
-					},
-				],
+				prompts: [...current.prompts, prompt],
 			};
 		});
 	};
 
-	const setNumericResponseConfig = (
-		key:
-			| 'temperature'
-			| 'top_p'
-			| 'top_k'
-			| 'top_a'
-			| 'min_p'
-			| 'repetition_penalty'
-			| 'frequency_penalty'
-			| 'presence_penalty'
-			| 'openai_max_tokens'
-			| 'seed'
-			| 'n',
-		value: string | number
-	) => {
-		setStBase((current) => {
-			if (!current) return current;
-			const responseConfig = { ...current.responseConfig };
-			if (typeof value === 'number' && Number.isFinite(value)) {
-				responseConfig[key] = value;
-			} else {
-				delete responseConfig[key];
+	const addPromptToPreferredOrder = (identifier: string) => {
+		updatePreferredOrder((order) => {
+			if (order.some((item) => item.identifier === identifier)) {
+				return order.map((item) => (item.identifier === identifier ? { ...item, enabled: true } : item));
 			}
-			return { ...current, responseConfig };
+			return [...order, { identifier, enabled: true }];
 		});
 	};
 
-	const setStringResponseConfig = (
-		key: 'reasoning_effort' | 'verbosity',
-		value: string | null
-	) => {
-		setStBase((current) => {
-			if (!current) return current;
-			const responseConfig = { ...current.responseConfig };
-			if (typeof value === 'string' && value.trim().length > 0) {
-				responseConfig[key] = value;
-			} else {
-				delete responseConfig[key];
-			}
-			return { ...current, responseConfig };
+	const setPromptContent = (identifier: string, content: string) => {
+		upsertPrompt({
+			...normalizePromptForEdit(promptMap.get(identifier), identifier),
+			content,
 		});
 	};
 
-	const setBooleanResponseConfig = (
-		key: 'enable_web_search' | 'stream_openai',
-		value: boolean
-	) => {
+	const updateCustomPromptField = (identifier: string, patch: Partial<StBasePrompt>) => {
+		const existing = normalizePromptForEdit(promptMap.get(identifier), identifier);
+		upsertPrompt({
+			...existing,
+			...patch,
+		});
+	};
+
+	const removePrompt = (identifier: string, index: number) => {
 		setStBase((current) => {
 			if (!current) return current;
+			const selectedOrder = resolvePreferredPromptOrder(current);
+			const nextOrder = selectedOrder.order.filter((_, itemIndex) => itemIndex !== index);
+			const existingIndex = current.promptOrder.findIndex((item) => item.character_id === selectedOrder.character_id);
+			const nextPromptOrder = [...current.promptOrder];
+			if (existingIndex >= 0) {
+				nextPromptOrder[existingIndex] = {
+					...nextPromptOrder[existingIndex],
+					order: nextOrder,
+				};
+			} else {
+				nextPromptOrder.unshift({
+					character_id: selectedOrder.character_id,
+					order: nextOrder,
+				});
+			}
+
+			const stillUsed = nextPromptOrder.some((item) =>
+				item.order.some((orderItem) => orderItem.identifier === identifier)
+			);
+
 			return {
 				...current,
-				responseConfig: {
-					...current.responseConfig,
-					[key]: value,
-				},
+				promptOrder: nextPromptOrder,
+				prompts: stillUsed
+					? current.prompts
+					: current.prompts.filter((item) => item.identifier !== identifier),
 			};
 		});
 	};
 
+	const handleAddStandardPrompt = () => {
+		if (!newStandardPromptIdentifier) return;
+		const definition = getStPromptDefinition(newStandardPromptIdentifier);
+		upsertPrompt(
+			definition ?? {
+				identifier: newStandardPromptIdentifier,
+				name: newStandardPromptIdentifier,
+				role: 'system',
+				system_prompt: true,
+				content: '',
+			}
+		);
+		addPromptToPreferredOrder(newStandardPromptIdentifier);
+		setCollapsedPromptById((current) => ({ ...current, [newStandardPromptIdentifier]: false }));
+		setNewStandardPromptIdentifier(null);
+	};
+
+	const handleAddCustomPrompt = () => {
+		const identifier = customPromptDraft.identifier.trim();
+		if (!identifier) {
+			setCustomPromptError(t('instructions.validation.promptIdentifierRequired'));
+			return;
+		}
+		if (!isValidSillyTavernPromptIdentifier(identifier)) {
+			setCustomPromptError(t('instructions.validation.promptIdentifierInvalid'));
+			return;
+		}
+		if (promptMap.has(identifier) || preferredOrder?.order.some((item) => item.identifier === identifier)) {
+			setCustomPromptError(t('instructions.validation.promptIdentifierDuplicate'));
+			return;
+		}
+
+		upsertPrompt({
+			identifier,
+			name: customPromptDraft.name.trim() || undefined,
+			role: customPromptDraft.role,
+			system_prompt: customPromptDraft.system_prompt,
+			marker: customPromptDraft.marker,
+			content: customPromptDraft.content,
+		});
+		addPromptToPreferredOrder(identifier);
+		setCollapsedPromptById((current) => ({ ...current, [identifier]: false }));
+		setCustomPromptDraft(createEmptyCustomPromptDraft());
+		setCustomPromptError(null);
+		setAddBlockOpened(false);
+	};
+
 	const onPrerender = async () => {
 		setPreviewLoading(true);
 		setPreviewError(null);
@@ -294,12 +354,14 @@ export const InstructionEditor = () => {
 
 	return (
 		<Stack gap="md" mt="md">
-			<Group justify="space-between" align="center">
+			<Stack gap={2}>
 				<Text fw={600}>{instruction.name}</Text>
-				<Badge variant="light">
-					{instruction.kind === 'st_base' ? t('instructions.kinds.stBase') : t('instructions.kinds.basic')}
-				</Badge>
-			</Group>
+				<Text size="sm" c="dimmed">
+					{instruction.kind === 'st_base'
+						? t('instructions.fields.stBaseTypeDescription')
+						: t('instructions.fields.basicTypeDescription')}
+				</Text>
+			</Stack>
 
 			{instruction.kind === 'basic' && (
 				<>
@@ -348,63 +410,142 @@ export const InstructionEditor = () => {
 				<Stack gap="sm">
 					<Group justify="space-between" align="center">
 						<Text fw={600}>{t('instructions.fields.promptBlocks')}</Text>
-						<Group gap="xs">
-							<Select
-								placeholder={t('instructions.placeholders.addPromptBlock')}
-								data={addablePromptIdentifiers.map((identifier) => ({
-									value: identifier,
-									label: identifier,
-								}))}
-								value={newPromptIdentifier}
-								onChange={setNewPromptIdentifier}
-								clearable
-								w={220}
-							/>
-							<Button
-								size="xs"
-								variant="light"
-								leftSection={<LuPlus size={14} />}
-								disabled={!newPromptIdentifier}
-								onClick={() => {
-									if (!newPromptIdentifier) return;
-									updatePreferredOrder((order) => [
-										...order,
-										{ identifier: newPromptIdentifier, enabled: true },
-									]);
-									setStBase((current) => {
-										if (!current) return current;
-										if (current.prompts.some((item) => item.identifier === newPromptIdentifier)) {
-											return current;
+						<Button
+							size="sm"
+							variant={addBlockOpened ? 'default' : 'light'}
+							leftSection={<LuPlus size={14} />}
+							onClick={() => {
+								setAddBlockOpened((current) => !current);
+								setCustomPromptError(null);
+							}}
+						>
+							{t('instructions.actions.addPromptBlock')}
+						</Button>
+					</Group>
+
+					<Collapse in={addBlockOpened}>
+						<Stack gap="md" p="sm" style={{ border: '1px solid var(--mantine-color-gray-3)', borderRadius: 8 }}>
+							<Stack gap="xs">
+								<Text fw={500}>{t('instructions.fields.addStandardBlock')}</Text>
+								<Group align="flex-end">
+									<Select
+										placeholder={t('instructions.placeholders.addPromptBlock')}
+										data={addablePromptIdentifiers.map((identifier) => ({
+											value: identifier,
+											label: getStPromptDefinition(identifier)?.name ?? identifier,
+										}))}
+										value={newStandardPromptIdentifier}
+										onChange={setNewStandardPromptIdentifier}
+										clearable
+										style={{ flex: 1 }}
+									/>
+									<Button variant="light" disabled={!newStandardPromptIdentifier} onClick={handleAddStandardPrompt}>
+										{t('common.add')}
+									</Button>
+								</Group>
+							</Stack>
+
+							<Stack gap="xs">
+								<Text fw={500}>{t('instructions.fields.addCustomBlock')}</Text>
+								<Group grow align="flex-start">
+									<TextInput
+										label={t('instructions.fields.promptIdentifier')}
+										value={customPromptDraft.identifier}
+										onChange={(event) => {
+											setCustomPromptDraft((current) => ({
+												...current,
+												identifier: event.currentTarget.value,
+											}));
+											setCustomPromptError(null);
+										}}
+										placeholder="my.custom-block"
+									/>
+									<TextInput
+										label={t('instructions.fields.promptName')}
+										value={customPromptDraft.name}
+										onChange={(event) =>
+											setCustomPromptDraft((current) => ({
+												...current,
+												name: event.currentTarget.value,
+											}))
+										}
+										placeholder={t('instructions.placeholders.promptName')}
+									/>
+									<Select
+										label={t('instructions.fields.promptRole')}
+										value={customPromptDraft.role}
+										onChange={(value) =>
+											setCustomPromptDraft((current) => ({
+												...current,
+												role: (value as CustomPromptDraft['role'] | null) ?? 'system',
+											}))
+										}
+										data={[
+											{ value: 'system', label: 'system' },
+											{ value: 'user', label: 'user' },
+											{ value: 'assistant', label: 'assistant' },
+										]}
+										allowDeselect={false}
+									/>
+								</Group>
+								<Group gap="lg">
+									<Switch
+										label="system_prompt"
+										checked={customPromptDraft.system_prompt}
+										onChange={(event) =>
+											setCustomPromptDraft((current) => ({
+												...current,
+												system_prompt: event.currentTarget.checked,
+											}))
 										}
-										const definition = getStPromptDefinition(newPromptIdentifier);
-										return {
+									/>
+									<Switch
+										label={t('instructions.fields.markerLabel')}
+										checked={customPromptDraft.marker}
+										onChange={(event) =>
+											setCustomPromptDraft((current) => ({
+												...current,
+												marker: event.currentTarget.checked,
+											}))
+										}
+									/>
+								</Group>
+								<Textarea
+									label={t('instructions.fields.promptContent')}
+									value={customPromptDraft.content}
+									onChange={(event) =>
+										setCustomPromptDraft((current) => ({
 											...current,
-											prompts: [
-												...current.prompts,
-												definition ?? {
-													identifier: newPromptIdentifier,
-													name: newPromptIdentifier,
-													role: 'system',
-													system_prompt: true,
-													content: '',
-												},
-											],
-										};
-									});
-									setNewPromptIdentifier(null);
-								}}
-							>
-								{t('common.add')}
-							</Button>
-						</Group>
-					</Group>
+											content: event.currentTarget.value,
+										}))
+									}
+									description={customPromptDraft.marker ? t('instructions.fields.markerDescription') : undefined}
+									minRows={4}
+									autosize
+									styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
+								/>
+								{customPromptError && (
+									<Text size="sm" c="red">
+										{customPromptError}
+									</Text>
+								)}
+								<Group justify="flex-end">
+									<Button variant="default" onClick={() => setCustomPromptDraft(createEmptyCustomPromptDraft())}>
+										{t('instructions.actions.resetCustomBlock')}
+									</Button>
+									<Button onClick={handleAddCustomPrompt}>{t('instructions.actions.addCustomBlock')}</Button>
+								</Group>
+							</Stack>
+						</Stack>
+					</Collapse>
 
 					{preferredOrder.order.map((entry, index) => {
 						const prompt = normalizePromptForEdit(promptMap.get(entry.identifier), entry.identifier);
-						const unsupported = !KNOWN_PROMPT_IDENTIFIERS.includes(entry.identifier);
-						const isMarkerPrompt = isSystemMarkerPrompt(prompt);
 						const sourceLabel = getStPromptSourceLabel(entry.identifier);
-						const isCollapsed = isPromptCollapsed(entry.identifier, isMarkerPrompt);
+						const standardPrompt = !isCustomPrompt(entry.identifier);
+						const runtimeManagedMarker = isSystemMarkerPrompt(prompt) && Boolean(sourceLabel);
+						const collapsibleMarker = runtimeManagedMarker || prompt.marker === true;
+						const isCollapsed = isPromptCollapsed(entry.identifier, collapsibleMarker);
 
 						return (
 							<Stack key={`${entry.identifier}_${index}`} gap={6} p="xs" style={{ border: '1px solid var(--mantine-color-gray-3)', borderRadius: 8 }}>
@@ -414,7 +555,7 @@ export const InstructionEditor = () => {
 											size="compact-sm"
 											variant="subtle"
 											px={4}
-											onClick={() => togglePromptCollapsed(entry.identifier, isMarkerPrompt)}
+											onClick={() => togglePromptCollapsed(entry.identifier, collapsibleMarker)}
 											aria-label={isCollapsed ? 'Expand block' : 'Collapse block'}
 										>
 											{isCollapsed ? <LuChevronRight size={16} /> : <LuChevronDown size={16} />}
@@ -429,10 +570,16 @@ export const InstructionEditor = () => {
 													)
 												);
 											}}
-											label={entry.identifier}
 											size="sm"
 										/>
-										{unsupported && <Badge color="orange" variant="light">{t('instructions.fields.unsupportedBlock')}</Badge>}
+										<Stack gap={0}>
+											<Text size="sm" fw={500}>
+												{prompt.name || entry.identifier}
+											</Text>
+											<Text size="xs" c="dimmed">
+												{entry.identifier}
+											</Text>
+										</Stack>
 									</Group>
 									<Group gap={4}>
 										<Button
@@ -472,10 +619,7 @@ export const InstructionEditor = () => {
 											variant="subtle"
 											color="red"
 											leftSection={<LuTrash2 size={14} />}
-											disabled={isMarkerPrompt}
-											onClick={() => {
-												updatePreferredOrder((order) => order.filter((_, itemIndex) => itemIndex !== index));
-											}}
+											onClick={() => removePrompt(entry.identifier, index)}
 										>
 											{t('common.delete')}
 										</Button>
@@ -483,8 +627,64 @@ export const InstructionEditor = () => {
 								</Group>
 
 								<Collapse in={!isCollapsed}>
-									<Stack gap={6}>
-										{isMarkerPrompt ? (
+									<Stack gap={8}>
+										<Text size="xs" c="dimmed">
+											{formatPromptMeta(prompt, t)}
+										</Text>
+
+										{isCustomPrompt(entry.identifier) && (
+											<Group grow align="flex-start">
+												<TextInput
+													label={t('instructions.fields.promptName')}
+													value={prompt.name ?? ''}
+													onChange={(event) =>
+														updateCustomPromptField(entry.identifier, {
+															name: event.currentTarget.value.trim() || undefined,
+														})
+													}
+												/>
+												<Select
+													label={t('instructions.fields.promptRole')}
+													value={prompt.role ?? 'system'}
+													onChange={(value) =>
+														updateCustomPromptField(entry.identifier, {
+															role: (value as StBasePrompt['role'] | null) ?? 'system',
+														})
+													}
+													data={[
+														{ value: 'system', label: 'system' },
+														{ value: 'user', label: 'user' },
+														{ value: 'assistant', label: 'assistant' },
+													]}
+													allowDeselect={false}
+												/>
+											</Group>
+										)}
+
+										{isCustomPrompt(entry.identifier) && (
+											<Group gap="lg">
+												<Switch
+													label="system_prompt"
+													checked={prompt.system_prompt === true}
+													onChange={(event) =>
+														updateCustomPromptField(entry.identifier, {
+															system_prompt: event.currentTarget.checked,
+														})
+													}
+												/>
+												<Switch
+													label={t('instructions.fields.markerLabel')}
+													checked={prompt.marker === true}
+													onChange={(event) =>
+														updateCustomPromptField(entry.identifier, {
+															marker: event.currentTarget.checked,
+														})
+													}
+												/>
+											</Group>
+										)}
+
+										{runtimeManagedMarker ? (
 											<Alert color="blue" variant="light" title={t('instructions.fields.systemBlockTitle')}>
 												<Stack gap={4}>
 													<Text size="sm">{t('instructions.fields.systemBlockDescription')}</Text>
@@ -500,146 +700,34 @@ export const InstructionEditor = () => {
 												value={prompt.content ?? ''}
 												onChange={(event) => setPromptContent(entry.identifier, event.currentTarget.value)}
 												placeholder={t('instructions.placeholders.promptBlockContent')}
+												description={prompt.marker ? t('instructions.fields.markerDescription') : undefined}
 												minRows={4}
 												autosize
 												styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
 											/>
 										)}
+
+										{!standardPrompt && (
+											<Text size="xs" c="dimmed">
+												{t('instructions.fields.customBlockHint')}
+											</Text>
+										)}
 									</Stack>
 								</Collapse>
 							</Stack>
 						);
 					})}
 
-					<Text fw={600}>{t('instructions.fields.responseConfig')}</Text>
-					<Group grow align="flex-start">
-						<NumberInput
-							label="temperature"
-							value={stBase.responseConfig.temperature}
-							onChange={(value) => setNumericResponseConfig('temperature', value)}
-							allowDecimal
-						/>
-						<NumberInput
-							label="top_p"
-							value={stBase.responseConfig.top_p}
-							onChange={(value) => setNumericResponseConfig('top_p', value)}
-							allowDecimal
-						/>
-						<NumberInput
-							label="top_k"
-							value={stBase.responseConfig.top_k}
-							onChange={(value) => setNumericResponseConfig('top_k', value)}
-							allowDecimal
-						/>
-					</Group>
-					<Group grow align="flex-start">
-						<NumberInput
-							label="top_a"
-							value={stBase.responseConfig.top_a}
-							onChange={(value) => setNumericResponseConfig('top_a', value)}
-							allowDecimal
-						/>
-						<NumberInput
-							label="min_p"
-							value={stBase.responseConfig.min_p}
-							onChange={(value) => setNumericResponseConfig('min_p', value)}
-							allowDecimal
-						/>
-						<NumberInput
-							label="repetition_penalty"
-							value={stBase.responseConfig.repetition_penalty}
-							onChange={(value) => setNumericResponseConfig('repetition_penalty', value)}
-							allowDecimal
-						/>
-					</Group>
-					<Group grow align="flex-start">
-						<NumberInput
-							label="frequency_penalty"
-							value={stBase.responseConfig.frequency_penalty}
-							onChange={(value) => setNumericResponseConfig('frequency_penalty', value)}
-							allowDecimal
-						/>
-						<NumberInput
-							label="presence_penalty"
-							value={stBase.responseConfig.presence_penalty}
-							onChange={(value) => setNumericResponseConfig('presence_penalty', value)}
-							allowDecimal
-						/>
-						<NumberInput
-							label="openai_max_tokens"
-							value={stBase.responseConfig.openai_max_tokens}
-							onChange={(value) => setNumericResponseConfig('openai_max_tokens', value)}
-							min={1}
-						/>
-					</Group>
-					<Group grow align="flex-start">
-						<NumberInput
-							label="seed"
-							value={stBase.responseConfig.seed}
-							onChange={(value) => setNumericResponseConfig('seed', value)}
-						/>
-						<NumberInput
-							label="n"
-							value={stBase.responseConfig.n}
-							onChange={(value) => setNumericResponseConfig('n', value)}
-							min={1}
-						/>
-						<Select
-							label="reasoning_effort"
-							value={stBase.responseConfig.reasoning_effort ?? null}
-							onChange={(value) => setStringResponseConfig('reasoning_effort', value)}
-							clearable
-							data={['auto', 'low', 'medium', 'high', 'min', 'max']}
-						/>
-					</Group>
-					<Group grow align="flex-start">
-						<Select
-							label="verbosity"
-							value={stBase.responseConfig.verbosity ?? null}
-							onChange={(value) => setStringResponseConfig('verbosity', value)}
-							clearable
-							data={['auto', 'low', 'medium', 'high']}
-						/>
-						<TextInput
-							label={t('instructions.fields.importSource')}
-							value={stBase.importInfo.source}
-							readOnly
-						/>
-						<TextInput
-							label={t('instructions.fields.importFileName')}
-							value={stBase.importInfo.fileName}
-							readOnly
-						/>
-					</Group>
-					<Group grow align="center">
-						<Switch
-							label="enable_web_search"
-							checked={stBase.responseConfig.enable_web_search === true}
-							onChange={(event) =>
-								setBooleanResponseConfig(
-									'enable_web_search',
-									event.currentTarget.checked
-								)
-							}
-						/>
-						<Switch
-							label="stream_openai"
-							checked={stBase.responseConfig.stream_openai === true}
-							onChange={(event) =>
-								setBooleanResponseConfig('stream_openai', event.currentTarget.checked)
-							}
-						/>
-						<TextInput
-							label={t('instructions.fields.importedAt')}
-							value={stBase.importInfo.importedAt}
-							readOnly
-						/>
-					</Group>
 					<Accordion variant="separated">
 						<Accordion.Item value="details">
 							<Accordion.Control>{t('instructions.fields.details')}</Accordion.Control>
 							<Accordion.Panel>
 								<Stack gap="sm">
+									<Group grow align="flex-start">
+										<TextInput label={t('instructions.fields.importSource')} value={stBase.importInfo.source} readOnly />
+										<TextInput label={t('instructions.fields.importFileName')} value={stBase.importInfo.fileName} readOnly />
+										<TextInput label={t('instructions.fields.importedAt')} value={stBase.importInfo.importedAt} readOnly />
+									</Group>
 									<Textarea
 										label={t('instructions.fields.rawPreset')}
 										value={rawPresetJson}
diff --git a/web/src/i18n/resources/en/instructions.ts b/web/src/i18n/resources/en/instructions.ts
index 91b3a76c..444103a5 100644
--- a/web/src/i18n/resources/en/instructions.ts
+++ b/web/src/i18n/resources/en/instructions.ts
@@ -13,27 +13,42 @@ const enInstructions = {
 	},
 	actions: {
 		create: 'Create instruction',
-		createBasic: 'Create basic',
-		createStBase: 'Create st-base',
+		createBasic: 'Simple',
+		createBasicDescription: 'A regular preset with one main instruction text.',
+		createStBase: 'SillyTavern-like',
+		createStBaseDescription: 'An ST-compatible preset seeded from the built-in Default.json.',
 		duplicate: 'Duplicate instruction',
 		delete: 'Delete instruction',
 		prerender: 'Prerender',
 		rename: 'Rename',
 		saveAs: 'Save as new',
 		updateCurrent: 'Update current preset',
+		addPromptBlock: 'Add block',
+		addCustomBlock: 'Add custom block',
+		resetCustomBlock: 'Reset form',
 		discardAndSwitch: 'Discard and switch',
 		importWithoutSensitive: 'Import without sensitive fields',
 		importAsIs: 'Import as-is',
 	},
 	fields: {
 		name: 'Name',
+		createInstructionType: 'Preset type',
+		basicTypeDescription: 'Type: Simple. One instruction text for a straightforward setup.',
+		stBaseTypeDescription: 'Type: SillyTavern-like. A SillyTavern-compatible prompt block preset.',
 		templateText: 'Template (LiquidJS)',
 		templateTextDescription: 'Syntax is validated on the backend when saving.',
 		prerender: 'Prerender',
 		prerenderDescription: 'Liquid render result on backend (without LLM generation).',
 		promptBlocks: 'Prompt blocks',
-		unsupportedBlock: 'unsupported in runtime',
-		responseConfig: 'Response config',
+		addStandardBlock: 'Add standard block',
+		addCustomBlock: 'Add custom block',
+		promptIdentifier: 'Identifier',
+		promptName: 'Block name',
+		promptRole: 'Role',
+		promptContent: 'Block content',
+		markerLabel: 'marker',
+		markerDescription: 'Marker blocks may keep empty content.',
+		customBlockHint: 'Custom block fields are preserved for SillyTavern export.',
 		importSource: 'Import source',
 		importFileName: 'Imported file',
 		importedAt: 'Imported at',
@@ -46,19 +61,21 @@ const enInstructions = {
 	},
 	placeholders: {
 		name: 'Enter name',
+		createInstructionType: 'Select preset type',
 		selectInstruction: 'Select instruction',
 		addPromptBlock: 'Add prompt block',
+		promptName: 'For example, Author Note',
 		promptBlockContent: 'Prompt content',
 	},
 	defaults: {
 		newInstruction: 'New instruction',
-		newStBaseInstruction: 'New st-base instruction',
+		newStBaseInstruction: 'New SillyTavern-like instruction',
 		newPreset: 'New preset',
 		importedInstruction: 'Imported instruction',
 	},
 	kinds: {
-		basic: 'basic',
-		stBase: 'st-base',
+		basic: 'Simple',
+		stBase: 'SillyTavern-like',
 	},
 	confirm: {
 		deleteInstruction: 'Delete instruction?',
@@ -67,13 +84,20 @@ const enInstructions = {
 			'Sensitive connection fields were found. Choose whether to strip them during import or keep them for round-trip export.',
 	},
 	dialogs: {
-		createTitle: 'Choose instruction type',
+		createTitle: 'Create preset',
+		createBasicHelp: 'Simple is best for a regular preset with one main instruction.',
+		createStBaseHelp: 'SillyTavern-like is best for prompt-block presets and stays compatible with SillyTavern import/export.',
 		renameTitle: 'Rename preset',
 		saveAsTitle: 'Save preset as',
 		deleteTitle: 'Delete preset',
 		discardTitle: 'Discard changes?',
 		sensitiveImportTitle: 'Sensitive import fields',
 	},
+	validation: {
+		promptIdentifierRequired: 'Provide a block identifier.',
+		promptIdentifierInvalid: 'Identifier may contain only letters, numbers, dots, underscores, and hyphens.',
+		promptIdentifierDuplicate: 'A block with this identifier already exists.',
+	},
 	toasts: {
 		exportNotPossibleTitle: 'Export not possible',
 		selectForExport: 'Select an instruction to export',
diff --git a/web/src/i18n/resources/ru/instructions.ts b/web/src/i18n/resources/ru/instructions.ts
index 6ad4cf81..940341eb 100644
--- a/web/src/i18n/resources/ru/instructions.ts
+++ b/web/src/i18n/resources/ru/instructions.ts
@@ -13,27 +13,42 @@ const ruInstructions = {
 	},
 	actions: {
 		create: 'Создать инструкцию',
-		createBasic: 'Создать basic',
-		createStBase: 'Создать st-base',
+		createBasic: 'Simple',
+		createBasicDescription: 'Обычный пресет с одним текстом инструкции.',
+		createStBase: 'SillyTavern-like',
+		createStBaseDescription: 'ST-совместимый пресет на основе встроенного Default.json.',
 		duplicate: 'Дублировать инструкцию',
 		delete: 'Удалить инструкцию',
 		prerender: 'Пререндер',
 		rename: 'Переименовать',
 		saveAs: 'Сохранить как новый',
 		updateCurrent: 'Обновить текущий пресет',
+		addPromptBlock: 'Добавить блок',
+		addCustomBlock: 'Добавить свой блок',
+		resetCustomBlock: 'Сбросить форму',
 		discardAndSwitch: 'Отбросить и переключить',
 		importWithoutSensitive: 'Импорт без чувствительных полей',
 		importAsIs: 'Импортировать как есть',
 	},
 	fields: {
 		name: 'Название',
+		createInstructionType: 'Тип пресета',
+		basicTypeDescription: 'Тип: Simple. Один текст инструкции для простого сценария.',
+		stBaseTypeDescription: 'Тип: SillyTavern-like. Совместимый с SillyTavern набор блоков промпта.',
 		templateText: 'Template (LiquidJS)',
 		templateTextDescription: 'Синтаксис проверяется на бэкенде при сохранении.',
 		prerender: 'Пререндер',
 		prerenderDescription: 'Результат рендера Liquid на бэкенде (без генерации LLM).',
 		promptBlocks: 'Блоки промпта',
-		unsupportedBlock: 'не поддерживается в runtime',
-		responseConfig: 'Параметры ответа',
+		addStandardBlock: 'Стандартный блок',
+		addCustomBlock: 'Свой блок',
+		promptIdentifier: 'Identifier',
+		promptName: 'Название блока',
+		promptRole: 'Role',
+		promptContent: 'Содержимое блока',
+		markerLabel: 'marker',
+		markerDescription: 'Для marker-блока пустое содержимое допустимо.',
+		customBlockHint: 'Поля custom-блока сохраняются и экспортируются в формате SillyTavern.',
 		importSource: 'Источник импорта',
 		importFileName: 'Импортированный файл',
 		importedAt: 'Время импорта',
@@ -46,19 +61,21 @@ const ruInstructions = {
 	},
 	placeholders: {
 		name: 'Введите название',
+		createInstructionType: 'Выберите тип пресета',
 		selectInstruction: 'Выберите инструкцию',
 		addPromptBlock: 'Добавить блок промпта',
+		promptName: 'Например, Author Note',
 		promptBlockContent: 'Содержимое блока',
 	},
 	defaults: {
 		newInstruction: 'Новая инструкция',
-		newStBaseInstruction: 'Новая st-base инструкция',
+		newStBaseInstruction: 'Новая SillyTavern-like инструкция',
 		newPreset: 'Новый пресет',
 		importedInstruction: 'Импортированная инструкция',
 	},
 	kinds: {
-		basic: 'basic',
-		stBase: 'st-base',
+		basic: 'Simple',
+		stBase: 'SillyTavern-like',
 	},
 	confirm: {
 		deleteInstruction: 'Удалить инструкцию?',
@@ -67,13 +84,20 @@ const ruInstructions = {
 			'Найдены чувствительные connection-поля. Выберите, удалить их при импорте или сохранить для round-trip экспорта.',
 	},
 	dialogs: {
-		createTitle: 'Выберите тип инструкции',
+		createTitle: 'Создать пресет',
+		createBasicHelp: 'Simple подходит для обычной инструкции с одним основным текстом.',
+		createStBaseHelp: 'SillyTavern-like подходит для пресетов с блоками промпта и совместим с импортом и экспортом SillyTavern.',
 		renameTitle: 'Переименовать пресет',
 		saveAsTitle: 'Сохранить пресет как',
 		deleteTitle: 'Удалить пресет',
 		discardTitle: 'Отбросить изменения?',
 		sensitiveImportTitle: 'Чувствительные поля импорта',
 	},
+	validation: {
+		promptIdentifierRequired: 'Укажите identifier для блока.',
+		promptIdentifierInvalid: 'Identifier может содержать только буквы, цифры, точки, подчёркивания и дефисы.',
+		promptIdentifierDuplicate: 'Блок с таким identifier уже существует.',
+	},
 	toasts: {
 		exportNotPossibleTitle: 'Экспорт невозможен',
 		selectForExport: 'Выберите инструкцию для экспорта',
diff --git a/web/src/model/instructions/index.ts b/web/src/model/instructions/index.ts
index c79d6e61..3f00cd27 100644
--- a/web/src/model/instructions/index.ts
+++ b/web/src/model/instructions/index.ts
@@ -10,7 +10,7 @@ import {
 } from '../../api/instructions';
 import i18n from '../../i18n';
 import { $currentChat, setChatInstructionRequested, setOpenedChat } from '../chat-core';
-import { createDefaultStBaseConfig } from './st-preset';
+import { createEmptyStBaseConfig } from './st-preset';
 
 import type { CreateInstructionDraft, InstructionDto } from '../../api/instructions';
 import type { InstructionMeta, StBaseConfig } from '@shared/types/instructions';
@@ -186,9 +186,9 @@ sample({
 					templateText: '{{char.name}}',
 			  }
 			: {
-					kind: 'st_base' as const,
-					name: i18n.t('instructions.defaults.newStBaseInstruction'),
-					stBase: createDefaultStBaseConfig(),
+				kind: 'st_base' as const,
+				name: i18n.t('instructions.defaults.newStBaseInstruction'),
+				stBase: createEmptyStBaseConfig(),
 			  },
 	target: createInstructionFx,
 });
diff --git a/web/src/model/instructions/st-preset.ts b/web/src/model/instructions/st-preset.ts
index dd17c5d1..83bea914 100644
--- a/web/src/model/instructions/st-preset.ts
+++ b/web/src/model/instructions/st-preset.ts
@@ -1,3 +1,8 @@
+import {
+	isSillyTavernPreset,
+	getSillyTavernPresetValidationError,
+	SILLY_TAVERN_PREFERRED_CHARACTER_ID,
+} from '@shared/utils/sillytavern-preset';
 import type {
 	StBaseConfig,
 	StBasePrompt,
@@ -6,8 +11,6 @@ import type {
 } from '@shared/types/instructions';
 import type { LlmProviderConfig, LlmProviderId } from '@shared/types/llm';
 
-const PROMPT_ORDER_PREFERRED_CHARACTER_ID = 100001;
-
 export const ST_SYSTEM_PROMPT_DEFAULTS: StBasePrompt[] = [
 	{
 		identifier: 'main',
@@ -100,15 +103,6 @@ export const ST_PROMPT_SOURCE_LABELS: Partial<Record<string, string>> = {
 	chatHistory: 'Chat History',
 };
 
-const ST_PRESET_DETECT_KEYS = new Set([
-	'chat_completion_source',
-	'prompts',
-	'prompt_order',
-	'openai_max_tokens',
-	'openai_model',
-	'temperature',
-]);
-
 export const ST_SENSITIVE_FIELDS = [
 	'reverse_proxy',
 	'proxy_password',
@@ -302,17 +296,14 @@ function normalizeResponseConfig(
 	return responseConfig;
 }
 
-export function createDefaultStBaseConfig(): StBaseConfig {
+export function createEmptyStBaseConfig(): StBaseConfig {
 	return {
 		rawPreset: {},
-		prompts: normalizeStPrompts([]),
+		prompts: [],
 		promptOrder: [
 			{
-				character_id: PROMPT_ORDER_PREFERRED_CHARACTER_ID,
-				order: [
-					{ identifier: 'main', enabled: true },
-					{ identifier: 'chatHistory', enabled: true },
-				],
+				character_id: SILLY_TAVERN_PREFERRED_CHARACTER_ID,
+				order: [],
 			},
 		],
 		responseConfig: {},
@@ -327,9 +318,11 @@ export function createDefaultStBaseConfig(): StBaseConfig {
 export function detectStChatCompletionPreset(
 	input: unknown
 ): input is Record<string, unknown> {
-	if (!isRecord(input)) return false;
-	if (input.type === 'talespinner.instruction') return false;
-	return Object.keys(input).some((key) => ST_PRESET_DETECT_KEYS.has(key));
+	return isSillyTavernPreset(input);
+}
+
+export function getStPresetValidationError(input: unknown): string | null {
+	return getSillyTavernPresetValidationError(input);
 }
 
 export function hasSensitivePresetFields(preset: Record<string, unknown>): boolean {
@@ -347,23 +340,8 @@ export function stripSensitiveFieldsFromPreset(
 }
 
 export function normalizeStPrompts(input: unknown): StBasePrompt[] {
-	if (!Array.isArray(input)) return [...ST_SYSTEM_PROMPT_DEFAULTS];
-	const normalized = input.map(normalizePrompt).filter((item): item is StBasePrompt => Boolean(item));
-	const byIdentifier = new Map<string, StBasePrompt>();
-
-	for (const prompt of ST_SYSTEM_PROMPT_DEFAULTS) {
-		byIdentifier.set(prompt.identifier, { ...prompt });
-	}
-
-	for (const prompt of normalized) {
-		const existing = byIdentifier.get(prompt.identifier);
-		byIdentifier.set(prompt.identifier, {
-			...(existing ?? {}),
-			...prompt,
-		});
-	}
-
-	return Array.from(byIdentifier.values());
+	if (!Array.isArray(input)) return [];
+	return input.map(normalizePrompt).filter((item): item is StBasePrompt => Boolean(item));
 }
 
 export function normalizeStPromptOrder(input: unknown): StBasePromptOrder[] {
@@ -378,6 +356,11 @@ export function createStBaseConfigFromPreset(params: {
 	fileName: string;
 	sensitiveImportMode: SensitiveImportMode;
 }): StBaseConfig {
+	const validationError = getSillyTavernPresetValidationError(params.preset);
+	if (validationError) {
+		throw new Error(validationError);
+	}
+
 	const rawPreset =
 		params.sensitiveImportMode === 'remove'
 			? stripSensitiveFieldsFromPreset(params.preset)
@@ -398,7 +381,7 @@ export function createStBaseConfigFromPreset(params: {
 export function resolvePreferredPromptOrder(stBase: StBaseConfig): StBasePromptOrder {
 	const preferred =
 		stBase.promptOrder.find(
-			(item) => item.character_id === PROMPT_ORDER_PREFERRED_CHARACTER_ID
+			(item) => item.character_id === SILLY_TAVERN_PREFERRED_CHARACTER_ID
 		) ?? stBase.promptOrder[0];
 
 	if (preferred) {
@@ -409,7 +392,7 @@ export function resolvePreferredPromptOrder(stBase: StBaseConfig): StBasePromptO
 	}
 
 	return {
-		character_id: PROMPT_ORDER_PREFERRED_CHARACTER_ID,
+		character_id: SILLY_TAVERN_PREFERRED_CHARACTER_ID,
 		order: stBase.prompts.map((item) => ({
 			identifier: item.identifier,
 			enabled: true,

From 5921c4d1d15d0f97b65c85916e253906197018fa Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Thu, 12 Mar 2026 22:25:36 +0300
Subject: [PATCH 10/54] fix: update agents.md

---
 AGENTS.md | 282 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 190 insertions(+), 92 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index a31a5a63..bf71b109 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,99 +1,197 @@
 # AGENTS.md - TaleSpinner
-Purpose: repository-specific instructions for Codex agents.
-(Назначение: правила работы агента именно в этом репозитории.)
-
-## Quick Commands (run from repo root)
-- Install deps: `yarn install:all` and `yarn install:docs`
-- Dev (server + web): `yarn dev`
-- Dev (docs): `yarn docs:dev`
-- Build all app parts: `yarn build`
+
+Repository contract for coding agents working in this repo.
+This file is strict on purpose. Follow it literally.
+
+## Project Identity
+- TaleSpinner is a local LLM application for storytelling, roleplay, and multi-agent scenario building.
+- The product is built around isolated profiles, chats and branches, world info, instructions, operation pipelines, and optional RAG flows.
+- The goal is not "one big prompt". The goal is a reproducible, controllable LLM workflow with clean context boundaries.
+
+## Quick Commands
+- Install app deps: `yarn install:all`
+- Install docs deps: `yarn install:docs`
+- Run backend + frontend: `yarn dev`
+- Run docs: `yarn docs:dev`
+- Build app: `yarn build`
 - Build docs: `yarn docs:build`
+- Typecheck backend: `yarn typecheck:server`
+- Typecheck frontend: `yarn typecheck:web`
+- Lint backend: `yarn lint:server`
+- Lint frontend: `yarn lint:web`
+- Run backend tests: `yarn --cwd server test`
+- Verify backend: `yarn verify:server`
+- Verify frontend: `yarn verify:web`
+- Check docs: `yarn docs:check`
+- Regenerate API docs: `yarn docs:generate:api`
 
 ## Stack Snapshot
-- Monorepo: `server` (Node.js + Express + TypeScript), `web` (Vite + React + TypeScript + Effector + Mantine), `docs` (Docusaurus), `shared` (shared TS contracts).
-- Package manager: Yarn Classic (1.x). Do not switch to npm/pnpm in tasks.
-- Runtime note: docs require Node >= 20 (`docs/package.json` engines).
-
-## Repo Map
-- Backend entrypoint: `server/src/index.ts`
-- API registry: `server/src/api/_routes_.ts`
-- Frontend entrypoint: `web/src/App.tsx`, bootstrap `web/src/main.tsx`
-- Frontend state: `web/src/model/*`
-- Docs RU: `docs/docs/**`
-- Docs EN: `docs/i18n/en/docusaurus-plugin-content-docs/current/**`
-- Shared contracts: `shared/**`
-- Legacy reference only: `server/src/legacy/**`, `web/src/legacy/**`
-
-## Working Rules
-- Keep changes scoped to the user request. No opportunistic refactors.
-- Prefer `rg` / `rg --files` for search.
-- Before changing code, inspect existing local patterns in neighboring files.
-- Do not edit `legacy` folders unless the task explicitly asks for legacy migration.
-- Never expose secrets or token values in output.
-- Keep code comments in English when adding comments.
+- Monorepo: `server` (Node.js + Express + TypeScript), `web` (Vite + React + TypeScript + Effector + Mantine), `docs` (Docusaurus), `shared` (shared contracts and utils), `data` (runtime data).
+- Package manager: Yarn Classic 1.x only. NEVER switch a task to npm or pnpm.
+- Runtime note: docs require Node `>=20`.
+
+## Repo Topology
+- `server/src/index.ts`: backend entrypoint.
+- `server/src/api/_routes_.ts`: API route registry.
+- `server/src/application/**`: use-cases and application orchestration.
+- `server/src/services/**`: domain services and repositories.
+- `server/src/core/**`: shared backend infrastructure, middleware, gateway, factories, errors, logging.
+- `server/src/db/schema/**`: database schema.
+- `web/src/main.tsx` and `web/src/App.tsx`: frontend bootstrap.
+- `web/src/model/**`: Effector business state. This is the default home for frontend domain logic.
+- `web/src/features/**`: UI features.
+- `web/src/api/**`: frontend API clients.
+- `web/src/ui/**`: shared UI and form primitives.
+- `web/src/i18n/**`: localization setup and RU/EN resources.
+- `shared/**`: source of truth for cross-layer contracts. If backend and frontend share a shape, it belongs here.
+- `docs/docs/**`: RU docs.
+- `docs/i18n/en/docusaurus-plugin-content-docs/current/**`: EN docs.
+- `server/src/legacy/**` and `web/src/legacy/**`: reference only. Do not edit unless the task is explicitly about legacy migration.
+
+## Global Non-Negotiables
+- MUST inspect neighboring code, tests, and docs before changing anything.
+- MUST keep changes tightly scoped to the request. No opportunistic refactors.
+- MUST prefer `rg` and `rg --files` for search when available.
+- MUST preserve existing architecture instead of inventing a parallel one.
+- MUST extract the touched slice before adding more logic to an oversized file.
+- NEVER edit `legacy/**` unless the task explicitly requires it.
+- NEVER expose secrets, token values, encryption keys, cookies, raw auth headers, or env-backed credentials in code, logs, screenshots, tests, or reports.
+- NEVER add comments in Russian inside code. Code comments must stay in English.
+- NEVER keep dead branches, commented-out code, placeholder TODO logic, or "temporary" debug flows in final changes.
+- NEVER solve a structural problem by adding more nesting, more flags, or more copy-pasted branches if extraction is the correct fix.
+
+## Code Size And Readability
+- Production files SHOULD stay at or below `300` lines and MUST NOT exceed `400` lines.
+- Functions SHOULD stay at or below `30` logical lines and MUST NOT exceed `50` lines.
+- React components SHOULD stay at or below `150` lines and MUST NOT exceed `200` lines.
+- A function should do one job. If it coordinates multiple concerns, split it.
+- Names MUST describe domain meaning, not implementation trivia.
+- Prefer explicit types, small helpers, and flat control flow over deeply nested conditions.
+- Exemptions are limited to generated files, translation dictionaries, migrations, fixtures, and exhaustive tests.
+- If a touched file already exceeds the limit, do not keep stacking logic into it. Extract the modified concern into smaller modules in the same task.
+
+## Backend Rules (`server/**`)
+
+### Architecture
+- Routes MUST stay thin.
+- Route files are for HTTP wiring only: parse request, validate input, call the application/service layer, map the response.
+- Business rules MUST live in use-cases or services, not inside Express handlers.
+- Persistence MUST live in repository-style modules, not inside routes or random helpers.
+- LLM provider access MUST go through the existing gateway/adapter layers in `core/llm-gateway` or the established service abstractions. Do not call providers ad hoc from unrelated modules.
+- Shared request/response contracts that matter to both layers MUST live in `shared/**`.
+
+### Validation And Types
+- Validate inputs at the edge with the existing validation patterns (`zod`, `validate`, route schemas).
+- Keep request/response flow typed end to end.
+- Avoid `any`. Use it only when the boundary is truly dynamic and no narrower type is reasonable. If `any` is unavoidable, keep it local and justify it in code.
+- Prefer explicit DTOs and domain types over loose object literals passed through many layers.
+
+### Errors, Logging, And Security
+- Use structured error handling. Do not swallow errors.
+- Never use an empty `catch`. If a catch intentionally suppresses an error, document why and keep the fallback explicit.
+- Never log raw request bodies if they may contain tokens, secrets, or untrusted large payloads.
+- Redact sensitive values in logs and error contexts.
+- Keep file access constrained to intended safe paths.
+- Treat user markdown, HTML, imported cards, templates, and external provider payloads as untrusted input.
+
+### Backend Testing
+- Backend work MUST follow TDD: write the failing test first, make it pass, then refactor.
+- Every backend feature or bug fix MUST add or update tests at the correct level.
+- Pure logic gets unit tests.
+- Service orchestration, repositories, and route contracts get integration or API tests.
+- User-visible backend flows and regression-prone orchestration paths get smoke or e2e coverage when behavior changes.
+
+## Frontend Rules (`web/**`)
+
+### State And Architecture
+- Effector is the default state layer for app state, business state, async flows, and cross-component coordination.
+- Business logic MUST live in `web/src/model/**`, domain utilities, or clearly scoped feature-model modules.
+- React components MUST stay focused on presentation and local interaction wiring.
+- `useState` is allowed only for leaf-local ephemeral UI state such as a disclosure toggle, a local tab, or a transient modal flag.
+- NEVER lift chains of `useState` up the tree for business state or form state.
+- NEVER put large app state into React component trees when Effector should own it.
+- If state is shared across features, persisted, async-driven, or affects multiple subtrees, it belongs in Effector.
+
+### Effector Rules
+- Use `useUnit` for subscribing to stores and binding events/effects in React.
+- Prefer small, atomic stores over monolithic "god stores".
+- Use declarative flows with `sample`, events, stores, and effects.
+- Keep `.watch` for debug or narrow side-effect bridges only. NEVER build core business logic around `.watch`.
+- NEVER place business rules directly inside React event handlers when they can be expressed as Effector events/effects.
+- NEVER subscribe a large top-level component to broad state if that causes avoidable rerenders of most of the app.
+- When a model file grows beyond the size limits, split by concern: state, effects, derived state, orchestration, adapters.
+
+### Forms And Render Performance
+- Forms MUST use `react-hook-form`.
+- Reuse shared form primitives from `web/src/ui/form-components/**` when they fit the task.
+- NEVER build production forms from chained `useState`, manual value syncing, or parent-driven controlled trees unless there is a proven exceptional reason.
+- Form subscriptions MUST be as narrow as possible. Prefer field-scoped subscriptions and render-conscious composition.
+- Form validation, serialization, and submission mapping should be isolated from presentational layout.
+- Large forms MUST be split into sections and extracted components before they become monoliths.
+
+### UI, UX, And Accessibility
+- Every user-facing UI change MUST be responsive for phone, tablet, and desktop.
+- Design MUST feel production-ready: consistent spacing, readable hierarchy, obvious states, and clear interaction affordances.
+- Do not ship desktop-only layouts, clipped drawers, overflowing modals, or controls that become unusable on smaller screens.
+- Inputs, buttons, icon buttons, menus, tabs, and dialogs MUST have accessible labels and predictable keyboard behavior.
+- Empty, loading, error, and disabled states are required when the feature can reach them.
+- Avoid unnecessary rerenders in heavy panels, message lists, editors, and forms.
+
+### Localization
+- All user-facing text MUST be localized in both Russian and English.
+- Keep RU and EN resource trees in sync.
+- Do not hardcode UI text in components, stores, helpers, or API mappers, except in tests, internal debug-only output, or truly non-user-facing diagnostics.
+- When adding a new feature, update both locales in the same task.
+
+### Frontend Testing
+- Frontend work MUST follow TDD the same way backend work does.
+- Missing frontend test infrastructure is not a waiver.
+- If a frontend task adds business logic, render-critical behavior, or regression-prone UI flows, the task MUST include adding or using appropriate frontend test coverage.
+- Pure utilities and transforms get unit tests.
+- Complex state transitions, model orchestration, and critical UI behavior get integration-style coverage.
+
+## Shared Contracts (`shared/**`)
+- Shared types are the contract between backend and frontend. Treat changes here as public interface changes inside the repo.
+- Do not duplicate shared shapes in `server` and `web`.
+- Any contract change MUST be validated in both app layers and reflected in docs when externally visible.
+
+## Docs Rules (`docs/**`)
+- Docs are code-adjacent and MUST match current behavior.
+- RU and EN docs must stay structurally aligned.
+- If API surface or shared contract behavior changes, regenerate API docs before docs checks.
+- Do not leave docs knowingly stale after changing visible behavior.
+
+## TDD And Mandatory Verification
+- TDD is mandatory: red -> green -> refactor.
+- "I will add tests later" is not acceptable.
+- After each completed feature, all required tests and checks must be green.
+- Mandatory post-feature full-suite commands:
+  - `yarn typecheck:server`
+  - `yarn lint:server`
+  - `yarn --cwd server test`
+  - `yarn build:server`
+  - `yarn typecheck:web`
+  - `yarn lint:web`
+  - `yarn build:web`
+  - `yarn docs:check`
+- If API routes or shared contract surface changed, run `yarn docs:generate:api` before `yarn docs:check`.
 
 ## Worktree Startup Rule
-- If current repo folder name starts with `TaleSpinner_` and is not `TaleSpinner_v1`, treat it as a git worktree for tasks.
-- At the start of each new task in such worktree:
+- If the current repo folder name starts with `TaleSpinner_` and is not exactly `TaleSpinner_v1`, treat it as a git worktree.
+- At the start of each new task in such a worktree:
   - run `git fetch origin dev`
-  - if current branch is `dev`, `main`, or detached `HEAD`, create and switch to a task branch from `origin/dev` before edits
-  - run `sync-db-from-main.bat --no-extra --no-pause` to refresh local DB from the main folder
-
-## Area-Specific Guidance
-
-### Backend (`server/**`)
-- Follow existing API style in `server/src/api/*` and shared middleware patterns (`asyncHandler`, `errorHandler`, `validate` where applicable).
-- For new or changed endpoints, prefer typed request/response flow and avoid `any`.
-- If endpoint behavior changes, ensure API docs inventory can be regenerated.
-
-Required checks after backend changes:
-- `yarn typecheck:server`
-- Run focused tests in server when logic is touched:
-  - all tests: `yarn --cwd server test`
-  - or targeted: `yarn --cwd server test -- <name-pattern>`
-
-### Frontend (`web/**`)
-- Respect FSD-style boundaries already used in repo (`features`, `model`, `ui`, `api`, `utils`).
-- Keep business logic in `model/*` or utilities, not large UI handlers.
-- Reuse existing aliases and local conventions.
-
-Required checks after frontend changes:
-- `yarn typecheck:web`
-- If build/tooling/entrypoint changed: `yarn build:web`
-
-### Docs (`docs/**`)
-- Docs are code-adjacent and must match current behavior.
-- Keep RU/EN structure parity.
-- If API routes changed: regenerate API endpoints docs.
-
-Required checks after docs or API-doc changes:
-- `yarn docs:generate:api` (only when API surface changed)
-- `yarn docs:check`
-
-### Shared (`shared/**`)
-- Any contract change must be validated in both app layers.
-
-Required checks after shared changes:
-- `yarn typecheck:server`
-- `yarn typecheck:web`
-
-## Definition of Done
-- Requested behavior implemented and consistent with neighboring architecture.
-- Required scope checks passed.
-- If docs touched, RU/EN parity preserved.
-- Final report includes:
-  - changed files
-  - why change was made
-  - commands executed
-  - test/check results
-
-## Safety & Data Handling
-- Treat `server/data/config/*` and env-backed credentials as sensitive.
-- Do not add endpoints that return raw secrets.
-- Keep static serving restricted to intended public media paths.
-- Treat user-provided markdown/HTML as untrusted content.
-
-## Instruction Hygiene (for future edits of this file)
-- Keep this file concise, concrete, and command-first.
-- Prefer actionable rules over broad style essays.
-- If rules become large, split by subdirectories with additional local `AGENTS.md` files.
+  - if the current branch is `dev`, `main`, or detached `HEAD`, create and switch to a task branch from `origin/dev` before edits
+  - run `sync-db-from-main.bat --no-extra --no-pause`
+
+## Definition Of Done
+- Requested behavior is implemented in the correct layer and consistent with neighboring architecture.
+- Tests are written first and end green.
+- Required full-suite checks are green.
+- RU/EN localization parity is preserved for user-facing text.
+- RU/EN docs parity is preserved when docs are touched.
+- Final report must include changed files, why the change was made, commands executed, and test/check results.
+
+## Instruction Hygiene
+- Keep this file concise, directive, and enforceable.
+- Prefer hard rules over taste-based advice.
+- Add new rules only when they materially improve agent behavior on this repo.

From 73a8792d6c2e15b1883cd5d54e75e541fdd6ea4c Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Thu, 12 Mar 2026 22:43:35 +0300
Subject: [PATCH 11/54] Fix chat swipe handler bug

---
 docs/docs/dev/backend/api-endpoints.md        | 144 +++++-----
 .../current/dev/backend/api-endpoints.md      | 144 +++++-----
 web/package.json                              |   5 +-
 .../features/chat-window/message/index.tsx    |  88 +-----
 .../chat-window/message/variant-controls.tsx  |  63 +++--
 .../message/variant-navigation.test.ts        |  72 +++++
 .../chat-window/message/variant-navigation.ts |  61 +++++
 web/tsconfig.node.json                        |   2 +-
 web/vitest.config.ts                          |  10 +
 web/yarn.lock                                 | 250 +++++++++++++++++-
 10 files changed, 574 insertions(+), 265 deletions(-)
 create mode 100644 web/src/features/chat-window/message/variant-navigation.test.ts
 create mode 100644 web/src/features/chat-window/message/variant-navigation.ts
 create mode 100644 web/vitest.config.ts

diff --git a/docs/docs/dev/backend/api-endpoints.md b/docs/docs/dev/backend/api-endpoints.md
index 605d54fd..3cd15711 100644
--- a/docs/docs/dev/backend/api-endpoints.md
+++ b/docs/docs/dev/backend/api-endpoints.md
@@ -17,6 +17,7 @@ description: Автогенерируемый инвентарь backend endpoin
 
 | Method | Path | Source file | Handler section |
 | --- | --- | --- | --- |
+| USE | /api/app-settings | `server/src/api/app-settings.api.ts` | L7 |
 | DELETE | /api/chats/:id | `server/src/api/chats.core.api.ts` | L91 |
 | GET | /api/chats/:id | `server/src/api/chats.core.api.ts` | L29 |
 | PUT | /api/chats/:id | `server/src/api/chats.core.api.ts` | L76 |
@@ -25,42 +26,43 @@ description: Автогенерируемый инвентарь backend endpoin
 | DELETE | /api/chats/:id/branches/:branchId | `server/src/api/chats.core.api.ts` | L178 |
 | PUT | /api/chats/:id/branches/:branchId | `server/src/api/chats.core.api.ts` | L159 |
 | POST | /api/chats/:id/branches/:branchId/activate | `server/src/api/chats.core.api.ts` | L135 |
-| GET | /api/chats/:id/entries | `server/src/api/chat-entries.api.ts` | L900 |
-| POST | /api/chats/:id/entries | `server/src/api/chat-entries.api.ts` | L975 |
-| POST | /api/chats/:id/entries/continue | `server/src/api/chat-entries.api.ts` | L1167 |
+| GET | /api/chats/:id/entries | `server/src/api/chat-entries.api.ts` | L206 |
+| POST | /api/chats/:id/entries | `server/src/api/chat-entries.api.ts` | L230 |
+| POST | /api/chats/:id/entries/continue | `server/src/api/chat-entries.api.ts` | L258 |
 | PUT | /api/chats/:id/instruction | `server/src/api/chats.core.api.ts` | L44 |
-| GET | /api/chats/:id/operation-runtime-state | `server/src/api/chat-entries.api.ts` | L1505 |
-| GET | /api/chats/:id/world-info/latest-activations | `server/src/api/chat-entries.api.ts` | L1580 |
-| ALL | /api/config/openrouter | `server/src/api/llm.api.ts` | L290 |
-| GET | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L219 |
-| POST | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L227 |
-| DELETE | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L335 |
-| GET | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L244 |
-| PUT | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L257 |
-| GET | /api/entity-profiles/:id/chats | `server/src/api/entity-profiles.core.api.ts` | L355 |
-| POST | /api/entity-profiles/:id/chats | `server/src/api/entity-profiles.core.api.ts` | L368 |
-| GET | /api/entity-profiles/:id/export | `server/src/api/entity-profiles.core.api.ts` | L300 |
+| GET | /api/chats/:id/operation-runtime-state | `server/src/api/chat-entries.api.ts` | L335 |
+| GET | /api/chats/:id/world-info/latest-activations | `server/src/api/chat-entries.api.ts` | L350 |
+| ALL | /api/config/openrouter | `server/src/api/llm.api.ts` | L260 |
+| GET | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L142 |
+| POST | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L150 |
+| DELETE | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L258 |
+| GET | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L167 |
+| PUT | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L180 |
+| GET | /api/entity-profiles/:id/chats | `server/src/api/entity-profiles.core.api.ts` | L278 |
+| POST | /api/entity-profiles/:id/chats | `server/src/api/entity-profiles.core.api.ts` | L291 |
+| GET | /api/entity-profiles/:id/export | `server/src/api/entity-profiles.core.api.ts` | L223 |
 | POST | /api/entity-profiles/import | `server/src/api/entity-profiles.import.api.ts` | L62 |
-| POST | /api/entries/:id/manual-edit | `server/src/api/chat-entries.api.ts` | L1981 |
-| POST | /api/entries/:id/parts/batch-update | `server/src/api/chat-entries.api.ts` | L2085 |
-| GET | /api/entries/:id/prompt-diagnostics | `server/src/api/chat-entries.api.ts` | L1449 |
-| POST | /api/entries/:id/prompt-visibility | `server/src/api/chat-entries.api.ts` | L2195 |
-| POST | /api/entries/:id/regenerate | `server/src/api/chat-entries.api.ts` | L1308 |
-| POST | /api/entries/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L2181 |
-| GET | /api/entries/:id/variants | `server/src/api/chat-entries.api.ts` | L1604 |
-| POST | /api/entries/:id/variants/:variantId/select | `server/src/api/chat-entries.api.ts` | L1621 |
-| POST | /api/entries/:id/variants/:variantId/soft-delete | `server/src/api/chat-entries.api.ts` | L2128 |
-| POST | /api/entries/soft-delete-bulk | `server/src/api/chat-entries.api.ts` | L2168 |
+| POST | /api/entries/:id/manual-edit | `server/src/api/chat-entries.api.ts` | L421 |
+| POST | /api/entries/:id/parts/batch-update | `server/src/api/chat-entries.api.ts` | L436 |
+| GET | /api/entries/:id/prompt-diagnostics | `server/src/api/chat-entries.api.ts` | L313 |
+| POST | /api/entries/:id/prompt-visibility | `server/src/api/chat-entries.api.ts` | L507 |
+| POST | /api/entries/:id/regenerate | `server/src/api/chat-entries.api.ts` | L287 |
+| POST | /api/entries/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L493 |
+| GET | /api/entries/:id/variants | `server/src/api/chat-entries.api.ts` | L365 |
+| POST | /api/entries/:id/variants/:variantId/select | `server/src/api/chat-entries.api.ts` | L383 |
+| POST | /api/entries/:id/variants/:variantId/soft-delete | `server/src/api/chat-entries.api.ts` | L453 |
+| POST | /api/entries/soft-delete-bulk | `server/src/api/chat-entries.api.ts` | L480 |
 | GET | /api/files/metadata/:filename | `server/src/api/files/routes.ts` | L71 |
 | POST | /api/files/upload | `server/src/api/files/routes.ts` | L53 |
 | POST | /api/files/upload-card | `server/src/api/files/routes.ts` | L59 |
 | POST | /api/files/upload-image | `server/src/api/files/routes.ts` | L65 |
 | POST | /api/generations/:id/abort | `server/src/api/generations.core.api.ts` | L16 |
-| GET | /api/instructions | `server/src/api/instructions.core.api.ts` | L42 |
-| POST | /api/instructions | `server/src/api/instructions.core.api.ts` | L95 |
-| DELETE | /api/instructions/:id | `server/src/api/instructions.core.api.ts` | L150 |
-| PUT | /api/instructions/:id | `server/src/api/instructions.core.api.ts` | L120 |
-| POST | /api/instructions/prerender | `server/src/api/instructions.core.api.ts` | L54 |
+| GET | /api/instructions | `server/src/api/instructions.core.api.ts` | L44 |
+| POST | /api/instructions | `server/src/api/instructions.core.api.ts` | L105 |
+| DELETE | /api/instructions/:id | `server/src/api/instructions.core.api.ts` | L188 |
+| PUT | /api/instructions/:id | `server/src/api/instructions.core.api.ts` | L146 |
+| GET | /api/instructions/default-st-preset | `server/src/api/instructions.core.api.ts` | L56 |
+| POST | /api/instructions/prerender | `server/src/api/instructions.core.api.ts` | L64 |
 | GET | /api/llm-preset-settings | `server/src/api/llm-presets.api.ts` | L185 |
 | PUT | /api/llm-preset-settings | `server/src/api/llm-presets.api.ts` | L201 |
 | GET | /api/llm-presets | `server/src/api/llm-presets.api.ts` | L77 |
@@ -68,34 +70,35 @@ description: Автогенерируемый инвентарь backend endpoin
 | DELETE | /api/llm-presets/:id | `server/src/api/llm-presets.api.ts` | L132 |
 | PUT | /api/llm-presets/:id | `server/src/api/llm-presets.api.ts` | L108 |
 | POST | /api/llm-presets/:id/apply | `server/src/api/llm-presets.api.ts` | L150 |
-| GET | /api/llm/models | `server/src/api/llm.api.ts` | L249 |
-| GET | /api/llm/providers | `server/src/api/llm.api.ts` | L47 |
-| GET | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L158 |
-| PATCH | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L168 |
-| GET | /api/llm/runtime | `server/src/api/llm.api.ts` | L62 |
-| PATCH | /api/llm/runtime | `server/src/api/llm.api.ts` | L80 |
-| GET | /api/llm/tokens | `server/src/api/llm.api.ts` | L187 |
-| POST | /api/llm/tokens | `server/src/api/llm.api.ts` | L205 |
-| DELETE | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L240 |
-| PATCH | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L226 |
-| GET | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L34 |
-| POST | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L42 |
-| DELETE | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L80 |
-| GET | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L54 |
-| PUT | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L65 |
-| GET | /api/operation-blocks/:id/export | `server/src/api/operation-blocks.core.api.ts` | L102 |
-| POST | /api/operation-blocks/import | `server/src/api/operation-blocks.core.api.ts` | L127 |
-| GET | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L52 |
-| POST | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L60 |
-| DELETE | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L130 |
-| GET | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L104 |
-| PUT | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L115 |
-| GET | /api/operation-profiles/:id/export | `server/src/api/operation-profiles.core.api.ts` | L144 |
-| GET | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L74 |
-| PUT | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L86 |
-| POST | /api/operation-profiles/import | `server/src/api/operation-profiles.core.api.ts` | L194 |
-| POST | /api/parts/:id/canonicalization-undo | `server/src/api/chat-entries.api.ts` | L2294 |
-| POST | /api/parts/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L2344 |
+| GET | /api/llm/models | `server/src/api/llm.api.ts` | L219 |
+| GET | /api/llm/providers | `server/src/api/llm.api.ts` | L56 |
+| POST | /api/llm/providers/:providerId/check | `server/src/api/llm.api.ts` | L135 |
+| GET | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L106 |
+| PATCH | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L116 |
+| GET | /api/llm/runtime | `server/src/api/llm.api.ts` | L71 |
+| PATCH | /api/llm/runtime | `server/src/api/llm.api.ts` | L89 |
+| GET | /api/llm/tokens | `server/src/api/llm.api.ts` | L157 |
+| POST | /api/llm/tokens | `server/src/api/llm.api.ts` | L175 |
+| DELETE | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L210 |
+| PATCH | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L196 |
+| GET | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L37 |
+| POST | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L45 |
+| DELETE | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L83 |
+| GET | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L57 |
+| PUT | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L68 |
+| GET | /api/operation-blocks/:id/export | `server/src/api/operation-blocks.core.api.ts` | L97 |
+| POST | /api/operation-blocks/import | `server/src/api/operation-blocks.core.api.ts` | L122 |
+| GET | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L56 |
+| POST | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L64 |
+| DELETE | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L127 |
+| GET | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L101 |
+| PUT | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L112 |
+| GET | /api/operation-profiles/:id/export | `server/src/api/operation-profiles.core.api.ts` | L141 |
+| GET | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L78 |
+| PUT | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L90 |
+| POST | /api/operation-profiles/import | `server/src/api/operation-profiles.core.api.ts` | L155 |
+| POST | /api/parts/:id/canonicalization-undo | `server/src/api/chat-entries.api.ts` | L530 |
+| POST | /api/parts/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L545 |
 | GET | /api/rag/chroma/collections | `server/src/api/rag-chroma.api.ts` | L77 |
 | POST | /api/rag/chroma/collections | `server/src/api/rag-chroma.api.ts` | L84 |
 | DELETE | /api/rag/chroma/collections/:name | `server/src/api/rag-chroma.api.ts` | L96 |
@@ -118,6 +121,7 @@ description: Автогенерируемый инвентарь backend endpoin
 | GET | /api/rag/runtime | `server/src/api/rag.api.ts` | L50 |
 | PATCH | /api/rag/runtime | `server/src/api/rag.api.ts` | L54 |
 | GET | /api/rag/tokens | `server/src/api/rag.api.ts` | L68 |
+| USE | /api/settings | `server/src/api/settings.api.ts` | L7 |
 | GET | /api/settings/rag-presets | `server/src/api/rag.api.ts` | L124 |
 | POST | /api/settings/rag-presets | `server/src/api/rag.api.ts` | L129 |
 | GET | /api/settings/user-persons | `server/src/api/user-persons.core.api.ts` | L105 |
@@ -135,19 +139,19 @@ description: Автогенерируемый инвентарь backend endpoin
 | DELETE | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L93 |
 | GET | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L39 |
 | PUT | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L72 |
-| GET | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L343 |
-| PUT | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L357 |
-| GET | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L167 |
-| POST | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L177 |
-| DELETE | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L226 |
-| GET | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L188 |
-| PUT | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L199 |
-| POST | /api/world-info/books/:id/duplicate | `server/src/api/world-info.core.api.ts` | L237 |
-| GET | /api/world-info/books/:id/export | `server/src/api/world-info.core.api.ts` | L303 |
-| POST | /api/world-info/books/import | `server/src/api/world-info.core.api.ts` | L254 |
-| POST | /api/world-info/resolve | `server/src/api/world-info.core.api.ts` | L382 |
-| GET | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L322 |
-| PUT | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L332 |
+| GET | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L346 |
+| PUT | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L360 |
+| GET | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L170 |
+| POST | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L180 |
+| DELETE | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L229 |
+| GET | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L191 |
+| PUT | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L202 |
+| POST | /api/world-info/books/:id/duplicate | `server/src/api/world-info.core.api.ts` | L240 |
+| GET | /api/world-info/books/:id/export | `server/src/api/world-info.core.api.ts` | L306 |
+| POST | /api/world-info/books/import | `server/src/api/world-info.core.api.ts` | L257 |
+| POST | /api/world-info/resolve | `server/src/api/world-info.core.api.ts` | L377 |
+| GET | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L325 |
+| PUT | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L335 |
 | USE | /media | `server/src/api/static.api.ts` | L21 |
 
 ## Notes
diff --git a/docs/i18n/en/docusaurus-plugin-content-docs/current/dev/backend/api-endpoints.md b/docs/i18n/en/docusaurus-plugin-content-docs/current/dev/backend/api-endpoints.md
index 6712b107..b12df72e 100644
--- a/docs/i18n/en/docusaurus-plugin-content-docs/current/dev/backend/api-endpoints.md
+++ b/docs/i18n/en/docusaurus-plugin-content-docs/current/dev/backend/api-endpoints.md
@@ -17,6 +17,7 @@ Sources:
 
 | Method | Path | Source file | Handler section |
 | --- | --- | --- | --- |
+| USE | /api/app-settings | `server/src/api/app-settings.api.ts` | L7 |
 | DELETE | /api/chats/:id | `server/src/api/chats.core.api.ts` | L91 |
 | GET | /api/chats/:id | `server/src/api/chats.core.api.ts` | L29 |
 | PUT | /api/chats/:id | `server/src/api/chats.core.api.ts` | L76 |
@@ -25,42 +26,43 @@ Sources:
 | DELETE | /api/chats/:id/branches/:branchId | `server/src/api/chats.core.api.ts` | L178 |
 | PUT | /api/chats/:id/branches/:branchId | `server/src/api/chats.core.api.ts` | L159 |
 | POST | /api/chats/:id/branches/:branchId/activate | `server/src/api/chats.core.api.ts` | L135 |
-| GET | /api/chats/:id/entries | `server/src/api/chat-entries.api.ts` | L900 |
-| POST | /api/chats/:id/entries | `server/src/api/chat-entries.api.ts` | L975 |
-| POST | /api/chats/:id/entries/continue | `server/src/api/chat-entries.api.ts` | L1167 |
+| GET | /api/chats/:id/entries | `server/src/api/chat-entries.api.ts` | L206 |
+| POST | /api/chats/:id/entries | `server/src/api/chat-entries.api.ts` | L230 |
+| POST | /api/chats/:id/entries/continue | `server/src/api/chat-entries.api.ts` | L258 |
 | PUT | /api/chats/:id/instruction | `server/src/api/chats.core.api.ts` | L44 |
-| GET | /api/chats/:id/operation-runtime-state | `server/src/api/chat-entries.api.ts` | L1505 |
-| GET | /api/chats/:id/world-info/latest-activations | `server/src/api/chat-entries.api.ts` | L1580 |
-| ALL | /api/config/openrouter | `server/src/api/llm.api.ts` | L290 |
-| GET | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L219 |
-| POST | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L227 |
-| DELETE | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L335 |
-| GET | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L244 |
-| PUT | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L257 |
-| GET | /api/entity-profiles/:id/chats | `server/src/api/entity-profiles.core.api.ts` | L355 |
-| POST | /api/entity-profiles/:id/chats | `server/src/api/entity-profiles.core.api.ts` | L368 |
-| GET | /api/entity-profiles/:id/export | `server/src/api/entity-profiles.core.api.ts` | L300 |
+| GET | /api/chats/:id/operation-runtime-state | `server/src/api/chat-entries.api.ts` | L335 |
+| GET | /api/chats/:id/world-info/latest-activations | `server/src/api/chat-entries.api.ts` | L350 |
+| ALL | /api/config/openrouter | `server/src/api/llm.api.ts` | L260 |
+| GET | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L142 |
+| POST | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L150 |
+| DELETE | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L258 |
+| GET | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L167 |
+| PUT | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L180 |
+| GET | /api/entity-profiles/:id/chats | `server/src/api/entity-profiles.core.api.ts` | L278 |
+| POST | /api/entity-profiles/:id/chats | `server/src/api/entity-profiles.core.api.ts` | L291 |
+| GET | /api/entity-profiles/:id/export | `server/src/api/entity-profiles.core.api.ts` | L223 |
 | POST | /api/entity-profiles/import | `server/src/api/entity-profiles.import.api.ts` | L62 |
-| POST | /api/entries/:id/manual-edit | `server/src/api/chat-entries.api.ts` | L1981 |
-| POST | /api/entries/:id/parts/batch-update | `server/src/api/chat-entries.api.ts` | L2085 |
-| GET | /api/entries/:id/prompt-diagnostics | `server/src/api/chat-entries.api.ts` | L1449 |
-| POST | /api/entries/:id/prompt-visibility | `server/src/api/chat-entries.api.ts` | L2195 |
-| POST | /api/entries/:id/regenerate | `server/src/api/chat-entries.api.ts` | L1308 |
-| POST | /api/entries/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L2181 |
-| GET | /api/entries/:id/variants | `server/src/api/chat-entries.api.ts` | L1604 |
-| POST | /api/entries/:id/variants/:variantId/select | `server/src/api/chat-entries.api.ts` | L1621 |
-| POST | /api/entries/:id/variants/:variantId/soft-delete | `server/src/api/chat-entries.api.ts` | L2128 |
-| POST | /api/entries/soft-delete-bulk | `server/src/api/chat-entries.api.ts` | L2168 |
+| POST | /api/entries/:id/manual-edit | `server/src/api/chat-entries.api.ts` | L421 |
+| POST | /api/entries/:id/parts/batch-update | `server/src/api/chat-entries.api.ts` | L436 |
+| GET | /api/entries/:id/prompt-diagnostics | `server/src/api/chat-entries.api.ts` | L313 |
+| POST | /api/entries/:id/prompt-visibility | `server/src/api/chat-entries.api.ts` | L507 |
+| POST | /api/entries/:id/regenerate | `server/src/api/chat-entries.api.ts` | L287 |
+| POST | /api/entries/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L493 |
+| GET | /api/entries/:id/variants | `server/src/api/chat-entries.api.ts` | L365 |
+| POST | /api/entries/:id/variants/:variantId/select | `server/src/api/chat-entries.api.ts` | L383 |
+| POST | /api/entries/:id/variants/:variantId/soft-delete | `server/src/api/chat-entries.api.ts` | L453 |
+| POST | /api/entries/soft-delete-bulk | `server/src/api/chat-entries.api.ts` | L480 |
 | GET | /api/files/metadata/:filename | `server/src/api/files/routes.ts` | L71 |
 | POST | /api/files/upload | `server/src/api/files/routes.ts` | L53 |
 | POST | /api/files/upload-card | `server/src/api/files/routes.ts` | L59 |
 | POST | /api/files/upload-image | `server/src/api/files/routes.ts` | L65 |
 | POST | /api/generations/:id/abort | `server/src/api/generations.core.api.ts` | L16 |
-| GET | /api/instructions | `server/src/api/instructions.core.api.ts` | L42 |
-| POST | /api/instructions | `server/src/api/instructions.core.api.ts` | L95 |
-| DELETE | /api/instructions/:id | `server/src/api/instructions.core.api.ts` | L150 |
-| PUT | /api/instructions/:id | `server/src/api/instructions.core.api.ts` | L120 |
-| POST | /api/instructions/prerender | `server/src/api/instructions.core.api.ts` | L54 |
+| GET | /api/instructions | `server/src/api/instructions.core.api.ts` | L44 |
+| POST | /api/instructions | `server/src/api/instructions.core.api.ts` | L105 |
+| DELETE | /api/instructions/:id | `server/src/api/instructions.core.api.ts` | L188 |
+| PUT | /api/instructions/:id | `server/src/api/instructions.core.api.ts` | L146 |
+| GET | /api/instructions/default-st-preset | `server/src/api/instructions.core.api.ts` | L56 |
+| POST | /api/instructions/prerender | `server/src/api/instructions.core.api.ts` | L64 |
 | GET | /api/llm-preset-settings | `server/src/api/llm-presets.api.ts` | L185 |
 | PUT | /api/llm-preset-settings | `server/src/api/llm-presets.api.ts` | L201 |
 | GET | /api/llm-presets | `server/src/api/llm-presets.api.ts` | L77 |
@@ -68,34 +70,35 @@ Sources:
 | DELETE | /api/llm-presets/:id | `server/src/api/llm-presets.api.ts` | L132 |
 | PUT | /api/llm-presets/:id | `server/src/api/llm-presets.api.ts` | L108 |
 | POST | /api/llm-presets/:id/apply | `server/src/api/llm-presets.api.ts` | L150 |
-| GET | /api/llm/models | `server/src/api/llm.api.ts` | L249 |
-| GET | /api/llm/providers | `server/src/api/llm.api.ts` | L47 |
-| GET | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L158 |
-| PATCH | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L168 |
-| GET | /api/llm/runtime | `server/src/api/llm.api.ts` | L62 |
-| PATCH | /api/llm/runtime | `server/src/api/llm.api.ts` | L80 |
-| GET | /api/llm/tokens | `server/src/api/llm.api.ts` | L187 |
-| POST | /api/llm/tokens | `server/src/api/llm.api.ts` | L205 |
-| DELETE | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L240 |
-| PATCH | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L226 |
-| GET | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L34 |
-| POST | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L42 |
-| DELETE | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L80 |
-| GET | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L54 |
-| PUT | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L65 |
-| GET | /api/operation-blocks/:id/export | `server/src/api/operation-blocks.core.api.ts` | L102 |
-| POST | /api/operation-blocks/import | `server/src/api/operation-blocks.core.api.ts` | L127 |
-| GET | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L52 |
-| POST | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L60 |
-| DELETE | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L130 |
-| GET | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L104 |
-| PUT | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L115 |
-| GET | /api/operation-profiles/:id/export | `server/src/api/operation-profiles.core.api.ts` | L144 |
-| GET | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L74 |
-| PUT | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L86 |
-| POST | /api/operation-profiles/import | `server/src/api/operation-profiles.core.api.ts` | L194 |
-| POST | /api/parts/:id/canonicalization-undo | `server/src/api/chat-entries.api.ts` | L2294 |
-| POST | /api/parts/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L2344 |
+| GET | /api/llm/models | `server/src/api/llm.api.ts` | L219 |
+| GET | /api/llm/providers | `server/src/api/llm.api.ts` | L56 |
+| POST | /api/llm/providers/:providerId/check | `server/src/api/llm.api.ts` | L135 |
+| GET | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L106 |
+| PATCH | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L116 |
+| GET | /api/llm/runtime | `server/src/api/llm.api.ts` | L71 |
+| PATCH | /api/llm/runtime | `server/src/api/llm.api.ts` | L89 |
+| GET | /api/llm/tokens | `server/src/api/llm.api.ts` | L157 |
+| POST | /api/llm/tokens | `server/src/api/llm.api.ts` | L175 |
+| DELETE | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L210 |
+| PATCH | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L196 |
+| GET | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L37 |
+| POST | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L45 |
+| DELETE | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L83 |
+| GET | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L57 |
+| PUT | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L68 |
+| GET | /api/operation-blocks/:id/export | `server/src/api/operation-blocks.core.api.ts` | L97 |
+| POST | /api/operation-blocks/import | `server/src/api/operation-blocks.core.api.ts` | L122 |
+| GET | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L56 |
+| POST | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L64 |
+| DELETE | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L127 |
+| GET | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L101 |
+| PUT | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L112 |
+| GET | /api/operation-profiles/:id/export | `server/src/api/operation-profiles.core.api.ts` | L141 |
+| GET | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L78 |
+| PUT | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L90 |
+| POST | /api/operation-profiles/import | `server/src/api/operation-profiles.core.api.ts` | L155 |
+| POST | /api/parts/:id/canonicalization-undo | `server/src/api/chat-entries.api.ts` | L530 |
+| POST | /api/parts/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L545 |
 | GET | /api/rag/chroma/collections | `server/src/api/rag-chroma.api.ts` | L77 |
 | POST | /api/rag/chroma/collections | `server/src/api/rag-chroma.api.ts` | L84 |
 | DELETE | /api/rag/chroma/collections/:name | `server/src/api/rag-chroma.api.ts` | L96 |
@@ -118,6 +121,7 @@ Sources:
 | GET | /api/rag/runtime | `server/src/api/rag.api.ts` | L50 |
 | PATCH | /api/rag/runtime | `server/src/api/rag.api.ts` | L54 |
 | GET | /api/rag/tokens | `server/src/api/rag.api.ts` | L68 |
+| USE | /api/settings | `server/src/api/settings.api.ts` | L7 |
 | GET | /api/settings/rag-presets | `server/src/api/rag.api.ts` | L124 |
 | POST | /api/settings/rag-presets | `server/src/api/rag.api.ts` | L129 |
 | GET | /api/settings/user-persons | `server/src/api/user-persons.core.api.ts` | L105 |
@@ -135,19 +139,19 @@ Sources:
 | DELETE | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L93 |
 | GET | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L39 |
 | PUT | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L72 |
-| GET | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L343 |
-| PUT | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L357 |
-| GET | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L167 |
-| POST | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L177 |
-| DELETE | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L226 |
-| GET | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L188 |
-| PUT | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L199 |
-| POST | /api/world-info/books/:id/duplicate | `server/src/api/world-info.core.api.ts` | L237 |
-| GET | /api/world-info/books/:id/export | `server/src/api/world-info.core.api.ts` | L303 |
-| POST | /api/world-info/books/import | `server/src/api/world-info.core.api.ts` | L254 |
-| POST | /api/world-info/resolve | `server/src/api/world-info.core.api.ts` | L382 |
-| GET | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L322 |
-| PUT | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L332 |
+| GET | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L346 |
+| PUT | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L360 |
+| GET | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L170 |
+| POST | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L180 |
+| DELETE | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L229 |
+| GET | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L191 |
+| PUT | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L202 |
+| POST | /api/world-info/books/:id/duplicate | `server/src/api/world-info.core.api.ts` | L240 |
+| GET | /api/world-info/books/:id/export | `server/src/api/world-info.core.api.ts` | L306 |
+| POST | /api/world-info/books/import | `server/src/api/world-info.core.api.ts` | L257 |
+| POST | /api/world-info/resolve | `server/src/api/world-info.core.api.ts` | L377 |
+| GET | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L325 |
+| PUT | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L335 |
 | USE | /media | `server/src/api/static.api.ts` | L21 |
 
 ## Notes
diff --git a/web/package.json b/web/package.json
index 173f0bd7..7b777998 100644
--- a/web/package.json
+++ b/web/package.json
@@ -5,6 +5,8 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "typecheck": "tsc -b",
     "build": "tsc -b && vite build",
     "lint": "eslint .",
@@ -80,6 +82,7 @@
     "typescript": "~5.9.3",
     "typescript-eslint": "^8.53.0",
     "vite": "^7.3.1",
-    "vite-tsconfig-paths": "^6.0.4"
+    "vite-tsconfig-paths": "^6.0.4",
+    "vitest": "3"
   }
 }
diff --git a/web/src/features/chat-window/message/index.tsx b/web/src/features/chat-window/message/index.tsx
index 060f8241..eab8a889 100644
--- a/web/src/features/chat-window/message/index.tsx
+++ b/web/src/features/chat-window/message/index.tsx
@@ -1,6 +1,6 @@
 import { Avatar, Box, Checkbox, Flex, Stack, Text } from '@mantine/core';
 import { useStoreMap, useUnit } from 'effector-react';
-import { memo, useCallback, useEffect, useMemo, useRef } from 'react';
+import { memo, useCallback, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { $currentEntityProfile } from '@model/chat-core';
@@ -19,8 +19,6 @@ import {
 	openEntryPartsEditorRequested,
 	openPromptInspectorRequested,
 	openUndoCanonicalizationPickerRequested,
-	regenerateRequested,
-	selectVariantRequested,
 	setEntryPromptVisibilityRequested,
 	updateEntryPartDraftRequested,
 } from '@model/chat-entry-parts';
@@ -247,8 +245,6 @@ const MessageInner: React.FC<MessageProps> = ({
 	const isStreaming = useUnit($isChatStreaming);
 	const currentTurn = useUnit($currentTurn);
 	const variantsById = useUnit($variantsByEntryId);
-	const touchStartRef = useRef<{ x: number; y: number } | null>(null);
-	const pointerStartRef = useRef<{ x: number; y: number } | null>(null);
 	const editState = useStoreMap({
 		store: $entryPartEdits,
 		keys: [data.entry.entryId],
@@ -285,13 +281,6 @@ const MessageInner: React.FC<MessageProps> = ({
 	const isOptimistic =
 		String(data.entry.entryId).startsWith('local_') || (typeof data.entry.meta === 'object' && Boolean((data.entry.meta as any)?.optimistic));
 	const variants = useMemo(() => variantsById[data.entry.entryId] ?? [], [variantsById, data.entry.entryId]);
-	const isImportedFirstMessage =
-		data.variant?.kind === 'import' &&
-		typeof data.entry.meta === 'object' &&
-		data.entry.meta !== null &&
-		Boolean((data.entry.meta as any)?.imported) &&
-		((data.entry.meta as any)?.kind === 'first_mes' || (data.entry.meta as any)?.source === 'entity_profile_import');
-	const canSwipeVariants = isAssistant && isLast && !isBulkDeleteMode;
 	const canOpenUndoCanonicalization = useMemo(() => {
 		if (!isUser) return false;
 		const parts = data.variant?.parts ?? [];
@@ -325,11 +314,6 @@ const MessageInner: React.FC<MessageProps> = ({
 		closeEntryPartEdit({ entryId: data.entry.entryId });
 	}, [closeEntryPartEdit, data.entry.entryId, isBulkDeleteMode]);
 
-	const currentVariantIndex = useMemo(() => {
-		if (variants.length === 0) return -1;
-		const idx = variants.findIndex((v) => v.variantId === data.entry.activeVariantId);
-		return idx >= 0 ? idx : variants.length - 1;
-	}, [data.entry.activeVariantId, variants]);
 	const activeVariantIndexInList = useMemo(
 		() => variants.findIndex((v) => v.variantId === data.entry.activeVariantId),
 		[data.entry.activeVariantId, variants],
@@ -339,72 +323,6 @@ const MessageInner: React.FC<MessageProps> = ({
 	const displayVariantCount = hasActiveOutsideList ? variants.length + 1 : variants.length > 0 ? variants.length : data.variant ? 1 : 0;
 	const canDeleteVariant = isAssistant && displayVariantCount > 1;
 
-	const swipePrev = () => {
-		if (!canSwipeVariants || isEditing || isStreaming || isOptimistic) return;
-		if (variants.length === 0 || currentVariantIndex <= 0) return;
-		const prev = variants[currentVariantIndex - 1];
-		if (!prev) return;
-		selectVariantRequested({ entryId: data.entry.entryId, variantId: prev.variantId });
-	};
-
-	const swipeNextOrRegenerate = () => {
-		if (!canSwipeVariants || isEditing || isStreaming || isOptimistic) return;
-		if (variants.length === 0) {
-			if (isLast && !isImportedFirstMessage) {
-				regenerateRequested({ entryId: data.entry.entryId });
-			}
-			return;
-		}
-		if (currentVariantIndex >= 0 && currentVariantIndex < variants.length - 1) {
-			const next = variants[currentVariantIndex + 1];
-			if (next) selectVariantRequested({ entryId: data.entry.entryId, variantId: next.variantId });
-			return;
-		}
-		if (isLast && !isImportedFirstMessage) {
-			regenerateRequested({ entryId: data.entry.entryId });
-		}
-	};
-
-	const tryApplySwipe = (deltaX: number, deltaY: number) => {
-		if (!canSwipeVariants) return;
-		const absX = Math.abs(deltaX);
-		const absY = Math.abs(deltaY);
-		if (absX < 48 || absX <= absY) return;
-		if (deltaX < 0) {
-			swipeNextOrRegenerate();
-			return;
-		}
-		swipePrev();
-	};
-
-	const handleTouchStart: React.TouchEventHandler<HTMLDivElement> = (event) => {
-		const touch = event.changedTouches[0];
-		if (!touch) return;
-		touchStartRef.current = { x: touch.clientX, y: touch.clientY };
-	};
-
-	const handleTouchEnd: React.TouchEventHandler<HTMLDivElement> = (event) => {
-		const start = touchStartRef.current;
-		touchStartRef.current = null;
-		if (!start) return;
-		const touch = event.changedTouches[0];
-		if (!touch) return;
-		tryApplySwipe(touch.clientX - start.x, touch.clientY - start.y);
-	};
-
-	const handlePointerDown: React.PointerEventHandler<HTMLDivElement> = (event) => {
-		if (event.button !== 0) return;
-		pointerStartRef.current = { x: event.clientX, y: event.clientY };
-	};
-
-	const handlePointerUp: React.PointerEventHandler<HTMLDivElement> = (event) => {
-		if (event.button !== 0) return;
-		const start = pointerStartRef.current;
-		pointerStartRef.current = null;
-		if (!start) return;
-		tryApplySwipe(event.clientX - start.x, event.clientY - start.y);
-	};
-
 	const handleOpenEdit = () => {
 		if (!canMutateParts) return;
 		if (isEditing) return;
@@ -540,10 +458,6 @@ const MessageInner: React.FC<MessageProps> = ({
 						data-role={isUser ? 'user' : 'assistant'}
 						data-prompt-excluded={isPromptExcluded ? 'true' : undefined}
 						data-bulk-selected={isBulkSelected ? 'true' : undefined}
-						onTouchStart={handleTouchStart}
-						onTouchEnd={handleTouchEnd}
-						onPointerDown={handlePointerDown}
-						onPointerUp={handlePointerUp}
 						onClick={isBulkDeleteMode ? () => onToggleBulkSelection({ entryId: data.entry.entryId }) : undefined}
 						style={isBulkDeleteMode ? { cursor: 'pointer' } : undefined}
 					>
diff --git a/web/src/features/chat-window/message/variant-controls.tsx b/web/src/features/chat-window/message/variant-controls.tsx
index cfe317dd..f6f59561 100644
--- a/web/src/features/chat-window/message/variant-controls.tsx
+++ b/web/src/features/chat-window/message/variant-controls.tsx
@@ -7,6 +7,8 @@ import { LuArrowLeft, LuArrowRight } from 'react-icons/lu';
 import { $variantsByEntryId, $variantsLoadingByEntryId, loadVariantsRequested, regenerateRequested, selectVariantRequested } from '@model/chat-entry-parts';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 
+import { pickActiveVariantIndex, resolveNextVariantAction, resolvePreviousVariantAction, type VariantNavigationAction } from './variant-navigation';
+
 import type { ChatEntryWithVariantDto } from '../../../api/chat-entry-parts';
 
 type Props = {
@@ -14,12 +16,6 @@ type Props = {
 	isLast: boolean;
 };
 
-function pickActiveIndex(variants: Array<{ variantId: string }>, activeVariantId: string): number {
-	if (variants.length === 0) return -1;
-	const idx = variants.findIndex((v) => v.variantId === activeVariantId);
-	return idx >= 0 ? idx : variants.length - 1;
-}
-
 export const VariantControls: React.FC<Props> = ({ entry, isLast }) => {
 	const { t } = useTranslation();
 	const variantsById = useUnit($variantsByEntryId);
@@ -43,7 +39,7 @@ export const VariantControls: React.FC<Props> = ({ entry, isLast }) => {
 	}, [isLast, entry.entry.entryId, entry.entry.role, isLoading, variants.length]);
 
 	const currentIndex = useMemo(
-		() => pickActiveIndex(variants, entry.entry.activeVariantId),
+		() => pickActiveVariantIndex(variants, entry.entry.activeVariantId),
 		[variants, entry.entry.activeVariantId],
 	);
 	const total = variants.length;
@@ -62,39 +58,40 @@ export const VariantControls: React.FC<Props> = ({ entry, isLast }) => {
 	const isFirst = currentIndex <= 0;
 	const isLastVariant = total === 0 ? true : hasActiveOutsideList ? true : currentIndex === total - 1;
 
-	const handleLeft = () => {
-		if (total === 0) return;
-		if (hasActiveOutsideList) {
-			const prev = variants[total - 1];
-			if (prev) selectVariantRequested({ entryId: entry.entry.entryId, variantId: prev.variantId });
-			return;
-		}
-		if (isFirst) return;
-		const next = variants[currentIndex - 1];
-		if (next) selectVariantRequested({ entryId: entry.entry.entryId, variantId: next.variantId });
-	};
-
-	const handleRight = () => {
-		if (total === 0) {
-			if (isLoading) return;
-			loadVariantsRequested({ entryId: entry.entry.entryId });
+	const applyAction = (action: VariantNavigationAction) => {
+		if (action.kind === 'select') {
+			selectVariantRequested({ entryId: entry.entry.entryId, variantId: action.variantId });
 			return;
 		}
-
-		if (hasActiveOutsideList) {
-			if (isImportedFirstMessage) return;
+		if (action.kind === 'regenerate') {
 			regenerateRequested({ entryId: entry.entry.entryId });
 			return;
 		}
-
-		if (!isLastVariant) {
-			const next = variants[currentIndex + 1];
-			if (next) selectVariantRequested({ entryId: entry.entry.entryId, variantId: next.variantId });
-			return;
+		if (action.kind === 'load') {
+			loadVariantsRequested({ entryId: entry.entry.entryId });
 		}
+	};
 
-		if (isImportedFirstMessage) return;
-		regenerateRequested({ entryId: entry.entry.entryId });
+	const handleLeft = () => {
+		applyAction(
+			resolvePreviousVariantAction({
+				variants,
+				activeVariantId: entry.entry.activeVariantId,
+				hasActiveOutsideList,
+			}),
+		);
+	};
+
+	const handleRight = () => {
+		applyAction(
+			resolveNextVariantAction({
+				variants,
+				activeVariantId: entry.entry.activeVariantId,
+				hasActiveOutsideList,
+				isImportedFirstMessage,
+				isLoading,
+			}),
+		);
 	};
 
 	const rightDisabled = total === 0 ? isLoading : isImportedFirstMessage ? isLastVariant : false;
diff --git a/web/src/features/chat-window/message/variant-navigation.test.ts b/web/src/features/chat-window/message/variant-navigation.test.ts
new file mode 100644
index 00000000..819b9c3f
--- /dev/null
+++ b/web/src/features/chat-window/message/variant-navigation.test.ts
@@ -0,0 +1,72 @@
+import { describe, expect, it } from 'vitest';
+
+import { pickActiveVariantIndex, resolveNextVariantAction, resolvePreviousVariantAction } from './variant-navigation';
+
+describe('variant navigation', () => {
+	it('falls back to the last known variant when the active id is absent', () => {
+		expect(
+			pickActiveVariantIndex(
+				[
+					{ variantId: 'v1' },
+					{ variantId: 'v2' },
+				],
+				'missing',
+			),
+		).toBe(1);
+	});
+
+	it('goes to the previous stored variant when the active variant exists only locally', () => {
+		expect(
+			resolvePreviousVariantAction({
+				variants: [
+					{ variantId: 'v1' },
+					{ variantId: 'v2' },
+				],
+				activeVariantId: 'local-active',
+				hasActiveOutsideList: true,
+			}),
+		).toEqual({ kind: 'select', variantId: 'v2' });
+	});
+
+	it('requests loading variants before regenerating when the list is still empty', () => {
+		expect(
+			resolveNextVariantAction({
+				variants: [],
+				activeVariantId: 'local-active',
+				hasActiveOutsideList: false,
+				isImportedFirstMessage: false,
+				isLoading: false,
+			}),
+		).toEqual({ kind: 'load' });
+	});
+
+	it('regenerates on the last assistant variant when regeneration is allowed', () => {
+		expect(
+			resolveNextVariantAction({
+				variants: [
+					{ variantId: 'v1' },
+					{ variantId: 'v2' },
+				],
+				activeVariantId: 'v2',
+				hasActiveOutsideList: false,
+				isImportedFirstMessage: false,
+				isLoading: false,
+			}),
+		).toEqual({ kind: 'regenerate' });
+	});
+
+	it('blocks regeneration for imported first messages on the last variant', () => {
+		expect(
+			resolveNextVariantAction({
+				variants: [
+					{ variantId: 'v1' },
+					{ variantId: 'v2' },
+				],
+				activeVariantId: 'v2',
+				hasActiveOutsideList: false,
+				isImportedFirstMessage: true,
+				isLoading: false,
+			}),
+		).toEqual({ kind: 'none' });
+	});
+});
diff --git a/web/src/features/chat-window/message/variant-navigation.ts b/web/src/features/chat-window/message/variant-navigation.ts
new file mode 100644
index 00000000..381e049c
--- /dev/null
+++ b/web/src/features/chat-window/message/variant-navigation.ts
@@ -0,0 +1,61 @@
+export type VariantNavigationAction =
+	| { kind: 'none' }
+	| { kind: 'load' }
+	| { kind: 'regenerate' }
+	| { kind: 'select'; variantId: string };
+
+type VariantSummary = {
+	variantId: string;
+};
+
+type BaseVariantNavigationParams = {
+	variants: VariantSummary[];
+	activeVariantId: string;
+	hasActiveOutsideList: boolean;
+};
+
+type NextVariantNavigationParams = BaseVariantNavigationParams & {
+	isImportedFirstMessage: boolean;
+	isLoading: boolean;
+};
+
+export function pickActiveVariantIndex(variants: VariantSummary[], activeVariantId: string): number {
+	if (variants.length === 0) return -1;
+	const idx = variants.findIndex((variant) => variant.variantId === activeVariantId);
+	return idx >= 0 ? idx : variants.length - 1;
+}
+
+export function resolvePreviousVariantAction(params: BaseVariantNavigationParams): VariantNavigationAction {
+	const total = params.variants.length;
+	if (total === 0) return { kind: 'none' };
+
+	if (params.hasActiveOutsideList) {
+		const previous = params.variants[total - 1];
+		return previous ? { kind: 'select', variantId: previous.variantId } : { kind: 'none' };
+	}
+
+	const currentIndex = pickActiveVariantIndex(params.variants, params.activeVariantId);
+	if (currentIndex <= 0) return { kind: 'none' };
+
+	const previous = params.variants[currentIndex - 1];
+	return previous ? { kind: 'select', variantId: previous.variantId } : { kind: 'none' };
+}
+
+export function resolveNextVariantAction(params: NextVariantNavigationParams): VariantNavigationAction {
+	const total = params.variants.length;
+	if (total === 0) {
+		return params.isLoading ? { kind: 'none' } : { kind: 'load' };
+	}
+
+	if (params.hasActiveOutsideList) {
+		return params.isImportedFirstMessage ? { kind: 'none' } : { kind: 'regenerate' };
+	}
+
+	const currentIndex = pickActiveVariantIndex(params.variants, params.activeVariantId);
+	if (currentIndex < total - 1) {
+		const next = params.variants[currentIndex + 1];
+		return next ? { kind: 'select', variantId: next.variantId } : { kind: 'none' };
+	}
+
+	return params.isImportedFirstMessage ? { kind: 'none' } : { kind: 'regenerate' };
+}
diff --git a/web/tsconfig.node.json b/web/tsconfig.node.json
index db0becc8..154fcaca 100644
--- a/web/tsconfig.node.json
+++ b/web/tsconfig.node.json
@@ -20,5 +20,5 @@
     "noFallthroughCasesInSwitch": true,
     "noUncheckedSideEffectImports": true
   },
-  "include": ["vite.config.ts"]
+  "include": ["vite.config.ts", "vitest.config.ts"]
 }
diff --git a/web/vitest.config.ts b/web/vitest.config.ts
new file mode 100644
index 00000000..53c36b46
--- /dev/null
+++ b/web/vitest.config.ts
@@ -0,0 +1,10 @@
+import tsconfigPaths from 'vite-tsconfig-paths';
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+	plugins: [tsconfigPaths()],
+	test: {
+		environment: 'node',
+		include: ['src/**/*.test.ts'],
+	},
+});
diff --git a/web/yarn.lock b/web/yarn.lock
index 180bc07b..66b52443 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -553,7 +553,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
   integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0", "@jridgewell/sourcemap-codec@^1.5.5":
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
   integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
@@ -1069,6 +1069,14 @@
   dependencies:
     "@babel/types" "^7.28.2"
 
+"@types/chai@^5.2.2":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.2.3.tgz#8e9cd9e1c3581fa6b341a5aed5588eb285be0b4a"
+  integrity sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==
+  dependencies:
+    "@types/deep-eql" "*"
+    assertion-error "^2.0.1"
+
 "@types/d3-array@^3.0.3":
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.2.2.tgz#e02151464d02d4a1b44646d0fcdb93faf88fde8c"
@@ -1154,6 +1162,11 @@
   dependencies:
     "@types/ms" "*"
 
+"@types/deep-eql@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/deep-eql/-/deep-eql-4.0.2.tgz#334311971d3a07121e7eb91b684a605e7eea9cbd"
+  integrity sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==
+
 "@types/estree-jsx@^1.0.0":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-1.0.5.tgz#858a88ea20f34fe65111f005a689fa1ebf70dc18"
@@ -1455,6 +1468,67 @@
     "@types/babel__core" "^7.20.5"
     react-refresh "^0.18.0"
 
+"@vitest/expect@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-3.2.4.tgz#8362124cd811a5ee11c5768207b9df53d34f2433"
+  integrity sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==
+  dependencies:
+    "@types/chai" "^5.2.2"
+    "@vitest/spy" "3.2.4"
+    "@vitest/utils" "3.2.4"
+    chai "^5.2.0"
+    tinyrainbow "^2.0.0"
+
+"@vitest/mocker@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-3.2.4.tgz#4471c4efbd62db0d4fa203e65cc6b058a85cabd3"
+  integrity sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==
+  dependencies:
+    "@vitest/spy" "3.2.4"
+    estree-walker "^3.0.3"
+    magic-string "^0.30.17"
+
+"@vitest/pretty-format@3.2.4", "@vitest/pretty-format@^3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-3.2.4.tgz#3c102f79e82b204a26c7a5921bf47d534919d3b4"
+  integrity sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==
+  dependencies:
+    tinyrainbow "^2.0.0"
+
+"@vitest/runner@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-3.2.4.tgz#5ce0274f24a971f6500f6fc166d53d8382430766"
+  integrity sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==
+  dependencies:
+    "@vitest/utils" "3.2.4"
+    pathe "^2.0.3"
+    strip-literal "^3.0.0"
+
+"@vitest/snapshot@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-3.2.4.tgz#40a8bc0346ac0aee923c0eefc2dc005d90bc987c"
+  integrity sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==
+  dependencies:
+    "@vitest/pretty-format" "3.2.4"
+    magic-string "^0.30.17"
+    pathe "^2.0.3"
+
+"@vitest/spy@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-3.2.4.tgz#cc18f26f40f3f028da6620046881f4e4518c2599"
+  integrity sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==
+  dependencies:
+    tinyspy "^4.0.3"
+
+"@vitest/utils@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-3.2.4.tgz#c0813bc42d99527fb8c5b138c7a88516bca46fea"
+  integrity sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==
+  dependencies:
+    "@vitest/pretty-format" "3.2.4"
+    loupe "^3.1.4"
+    tinyrainbow "^2.0.0"
+
 "@xyflow/react@^12.10.0":
   version "12.10.0"
   resolved "https://registry.yarnpkg.com/@xyflow/react/-/react-12.10.0.tgz#d2924cb38074e8e6141643dd8bd7a0666aaac868"
@@ -1579,6 +1653,11 @@ arraybuffer.prototype.slice@^1.0.4:
     get-intrinsic "^1.2.6"
     is-array-buffer "^3.0.4"
 
+assertion-error@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-2.0.1.tgz#f641a196b335690b1070bf00b6e7593fec190bf7"
+  integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==
+
 async-function@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
@@ -1671,6 +1750,11 @@ browserslist@^4.24.0, browserslist@^4.28.1:
     node-releases "^2.0.27"
     update-browserslist-db "^1.2.0"
 
+cac@^6.7.14:
+  version "6.7.14"
+  resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
+  integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
+
 call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
@@ -1717,6 +1801,17 @@ ccount@^2.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
   integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
 
+chai@^5.2.0:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-5.3.3.tgz#dd3da955e270916a4bd3f625f4b919996ada7e06"
+  integrity sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==
+  dependencies:
+    assertion-error "^2.0.1"
+    check-error "^2.1.1"
+    deep-eql "^5.0.1"
+    loupe "^3.1.0"
+    pathval "^2.0.0"
+
 chalk@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
@@ -1745,6 +1840,11 @@ character-reference-invalid@^2.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz#85c66b041e43b47210faf401278abf808ac45cb9"
   integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==
 
+check-error@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-2.1.3.tgz#2427361117b70cca8dc89680ead32b157019caf5"
+  integrity sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==
+
 classcat@^5.0.3:
   version "5.0.5"
   resolved "https://registry.yarnpkg.com/classcat/-/classcat-5.0.5.tgz#8c209f359a93ac302404a10161b501eba9c09c77"
@@ -2003,6 +2103,11 @@ decode-named-character-reference@^1.0.0:
   dependencies:
     character-entities "^2.0.0"
 
+deep-eql@^5.0.1:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-5.0.2.tgz#4b756d8d770a9257300825d52a2c2cff99c3a341"
+  integrity sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==
+
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -2194,6 +2299,11 @@ es-errors@^1.3.0:
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
+es-module-lexer@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.7.0.tgz#9159601561880a85f2734560a9099b2c31e5372a"
+  integrity sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==
+
 es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
@@ -2448,6 +2558,13 @@ estree-util-is-identifier-name@^3.0.0:
   resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz#0b5ef4c4ff13508b34dcd01ecfa945f61fce5dbd"
   integrity sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==
 
+estree-walker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -2458,6 +2575,11 @@ eventemitter3@^5.0.1:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
   integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
 
+expect-type@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-1.3.0.tgz#0d58ed361877a31bbc4dd6cf71bbfef7faf6bd68"
+  integrity sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==
+
 extend@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
@@ -3157,6 +3279,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-tokens@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-9.0.1.tgz#2ec43964658435296f6761b34e10671c2d9527f4"
+  integrity sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==
+
 js-yaml@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
@@ -3257,6 +3384,11 @@ loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+loupe@^3.1.0, loupe@^3.1.4:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.2.1.tgz#0095cf56dc5b7a9a7c08ff5b1a8796ec8ad17e76"
+  integrity sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -3264,6 +3396,13 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+magic-string@^0.30.17:
+  version "0.30.21"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91"
+  integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.5"
+
 markdown-it@^14.0.0:
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.0.tgz#3c3c5992883c633db4714ccb4d7b5935d98b7d45"
@@ -3966,6 +4105,16 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pathe@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
+  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
+
+pathval@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.1.tgz#8855c5a2899af072d6ac05d11e46045ad0dc605d"
+  integrity sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==
+
 patronum@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/patronum/-/patronum-2.3.0.tgz#9b49ebc7380c228cb24dc7093bac11bc84f4b2a9"
@@ -3976,7 +4125,7 @@ picocolors@^1.1.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
-picomatch@^4.0.3:
+picomatch@^4.0.2, picomatch@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
   integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
@@ -4674,6 +4823,11 @@ side-channel@^1.1.0:
     side-channel-map "^1.0.1"
     side-channel-weakmap "^1.0.2"
 
+siginfo@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
+  integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==
+
 source-map-js@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
@@ -4699,6 +4853,16 @@ stable-hash-x@^0.2.0:
   resolved "https://registry.yarnpkg.com/stable-hash-x/-/stable-hash-x-0.2.0.tgz#dfd76bfa5d839a7470125c6a6b3c8b22061793e9"
   integrity sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==
 
+stackback@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b"
+  integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
+
+std-env@^3.9.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.10.0.tgz#d810b27e3a073047b2b5e40034881f5ea6f9c83b"
+  integrity sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==
+
 stop-iteration-iterator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
@@ -4757,6 +4921,13 @@ strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+strip-literal@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-3.1.0.tgz#222b243dd2d49c0bcd0de8906adbd84177196032"
+  integrity sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==
+  dependencies:
+    js-tokens "^9.0.1"
+
 style-to-js@^1.0.0:
   version "1.1.21"
   resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.21.tgz#2908941187f857e79e28e9cd78008b9a0b3e0e8d"
@@ -4803,6 +4974,16 @@ tiny-invariant@^1.3.3:
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
   integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
 
+tinybench@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.9.0.tgz#103c9f8ba6d7237a47ab6dd1dcff77251863426b"
+  integrity sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==
+
+tinyexec@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
+  integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
+
 tinyglobby@^0.2.14, tinyglobby@^0.2.15:
   version "0.2.15"
   resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2"
@@ -4811,6 +4992,21 @@ tinyglobby@^0.2.14, tinyglobby@^0.2.15:
     fdir "^6.5.0"
     picomatch "^4.0.3"
 
+tinypool@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-1.1.1.tgz#059f2d042bd37567fbc017d3d426bdd2a2612591"
+  integrity sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==
+
+tinyrainbow@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-2.0.0.tgz#9509b2162436315e80e3eee0fcce4474d2444294"
+  integrity sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==
+
+tinyspy@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-4.0.4.tgz#d77a002fb53a88aa1429b419c1c92492e0c81f78"
+  integrity sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==
+
 trim-lines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
@@ -5129,6 +5325,17 @@ victory-vendor@^37.0.2:
     d3-time "^3.0.0"
     d3-timer "^3.0.1"
 
+vite-node@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-3.2.4.tgz#f3676d94c4af1e76898c162c92728bca65f7bb07"
+  integrity sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==
+  dependencies:
+    cac "^6.7.14"
+    debug "^4.4.1"
+    es-module-lexer "^1.7.0"
+    pathe "^2.0.3"
+    vite "^5.0.0 || ^6.0.0 || ^7.0.0-0"
+
 vite-tsconfig-paths@^6.0.4:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-6.0.4.tgz#637e7608065acce67962cdd4bc3bbd47817b0cc0"
@@ -5139,7 +5346,7 @@ vite-tsconfig-paths@^6.0.4:
     tsconfck "^3.0.3"
     vite "*"
 
-vite@*, vite@^7.3.1:
+vite@*, "vite@^5.0.0 || ^6.0.0 || ^7.0.0-0", vite@^7.3.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/vite/-/vite-7.3.1.tgz#7f6cfe8fb9074138605e822a75d9d30b814d6507"
   integrity sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==
@@ -5153,6 +5360,35 @@ vite@*, vite@^7.3.1:
   optionalDependencies:
     fsevents "~2.3.3"
 
+vitest@3:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-3.2.4.tgz#0637b903ad79d1539a25bc34c0ed54b5c67702ea"
+  integrity sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==
+  dependencies:
+    "@types/chai" "^5.2.2"
+    "@vitest/expect" "3.2.4"
+    "@vitest/mocker" "3.2.4"
+    "@vitest/pretty-format" "^3.2.4"
+    "@vitest/runner" "3.2.4"
+    "@vitest/snapshot" "3.2.4"
+    "@vitest/spy" "3.2.4"
+    "@vitest/utils" "3.2.4"
+    chai "^5.2.0"
+    debug "^4.4.1"
+    expect-type "^1.2.1"
+    magic-string "^0.30.17"
+    pathe "^2.0.3"
+    picomatch "^4.0.2"
+    std-env "^3.9.0"
+    tinybench "^2.9.0"
+    tinyexec "^0.3.2"
+    tinyglobby "^0.2.14"
+    tinypool "^1.1.1"
+    tinyrainbow "^2.0.0"
+    vite "^5.0.0 || ^6.0.0 || ^7.0.0-0"
+    vite-node "3.2.4"
+    why-is-node-running "^2.3.0"
+
 void-elements@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
@@ -5228,6 +5464,14 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
+why-is-node-running@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.3.0.tgz#a3f69a97107f494b3cdc3bdddd883a7d65cebf04"
+  integrity sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==
+  dependencies:
+    siginfo "^2.0.0"
+    stackback "0.0.2"
+
 word-wrap@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"

From 48b4904f0332c489b6458427367704620833ebc0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Fri, 13 Mar 2026 00:48:21 +0300
Subject: [PATCH 12/54] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=B0=20=D0=B8=20=D1=8D?=
 =?UTF-8?q?=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sidebars/agent-cards/components/upload.tsx     |  4 ++--
 .../agent-cards/entity-profile-editor-modal.tsx    |  5 +++--
 .../features/sidebars/common/sidebar-header.tsx    |  7 ++++---
 web/src/features/sidebars/instructions/index.tsx   | 12 +++++++-----
 .../operation-profiles/ui/block-actions.tsx        |  7 ++++---
 .../operation-profiles/ui/profile-actions.tsx      |  7 ++++---
 web/src/features/sidebars/world-info/index.tsx     |  7 ++++---
 web/src/ui/file-transfer-icons.test.ts             | 14 ++++++++++++++
 web/src/ui/file-transfer-icons.ts                  | 10 ++++++++++
 9 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 web/src/ui/file-transfer-icons.test.ts
 create mode 100644 web/src/ui/file-transfer-icons.ts

diff --git a/web/src/features/sidebars/agent-cards/components/upload.tsx b/web/src/features/sidebars/agent-cards/components/upload.tsx
index 91b2bb57..6d8e9b39 100644
--- a/web/src/features/sidebars/agent-cards/components/upload.tsx
+++ b/web/src/features/sidebars/agent-cards/components/upload.tsx
@@ -1,8 +1,8 @@
 import { useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuUpload } from 'react-icons/lu';
 
 import { importEntityProfilesFx } from '@model/chat-core';
+import { IMPORT_FILE_ICON } from '@ui/file-transfer-icons';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 import { toaster } from '@ui/toaster';
 
@@ -50,7 +50,7 @@ export const Upload = ({ onImportFinished }: UploadProps) => {
 				onChange={(e) => handleFileChange(e.currentTarget.files)}
 			/>
 			<IconButtonWithTooltip
-				icon={<LuUpload />}
+				icon={<IMPORT_FILE_ICON />}
 				tooltip={t('common.import')}
 				aria-label={t('common.import')}
 				variant="ghost"
diff --git a/web/src/features/sidebars/agent-cards/entity-profile-editor-modal.tsx b/web/src/features/sidebars/agent-cards/entity-profile-editor-modal.tsx
index b703bb37..13e1447f 100644
--- a/web/src/features/sidebars/agent-cards/entity-profile-editor-modal.tsx
+++ b/web/src/features/sidebars/agent-cards/entity-profile-editor-modal.tsx
@@ -12,9 +12,10 @@ import {
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { FormProvider, Controller, useController, useFieldArray, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { LuArrowDown, LuArrowUp, LuDownload, LuExpand, LuPlus, LuStar, LuTrash2 } from 'react-icons/lu';
+import { LuArrowDown, LuArrowUp, LuExpand, LuPlus, LuStar, LuTrash2 } from 'react-icons/lu';
 
 import { Dialog } from '@ui/dialog';
+import { EXPORT_FILE_ICON } from '@ui/file-transfer-icons';
 import { FormInput, FormTextarea } from '@ui/form-components';
 import { TextareaFullscreenDialog } from '@ui/form-components/components/textarea-fullscreen-dialog';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
@@ -436,7 +437,7 @@ export const EntityProfileEditorModal = ({
 									/>
 									<Button
 										type="button"
-										leftSection={<LuDownload />}
+										leftSection={<EXPORT_FILE_ICON />}
 										variant="light"
 										disabled={isBusy}
 										loading={exporting}
diff --git a/web/src/features/sidebars/common/sidebar-header.tsx b/web/src/features/sidebars/common/sidebar-header.tsx
index 0a4bec37..0b4a1a77 100644
--- a/web/src/features/sidebars/common/sidebar-header.tsx
+++ b/web/src/features/sidebars/common/sidebar-header.tsx
@@ -1,8 +1,9 @@
 import { Group, Select } from '@mantine/core';
 import { type CommonModelItemType, type CommonModelSettingsType } from '@shared/types/common-model-types';
 import { useTranslation } from 'react-i18next';
-import { LuPlus, LuCopy, LuTrash2, LuUpload, LuDownload } from 'react-icons/lu';
+import { LuPlus, LuCopy, LuTrash2 } from 'react-icons/lu';
 
+import { EXPORT_FILE_ICON, IMPORT_FILE_ICON } from '@ui/file-transfer-icons';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 
 import { useFileOperations } from './use-file-operations';
@@ -86,13 +87,13 @@ export const SidebarHeader = <SettingsType extends CommonModelSettingsType, Item
 					/>
 					<IconButtonWithTooltip
 						tooltip={t('common.import')}
-						icon={<LuUpload />}
+						icon={<IMPORT_FILE_ICON />}
 						aria-label={t('common.import')}
 						onClick={handleImport}
 					/>
 					<IconButtonWithTooltip
 						tooltip={t('common.export')}
-						icon={<LuDownload />}
+						icon={<EXPORT_FILE_ICON />}
 						aria-label={t('common.export')}
 						disabled={!settings.selectedId}
 						onClick={handleExport}
diff --git a/web/src/features/sidebars/instructions/index.tsx b/web/src/features/sidebars/instructions/index.tsx
index b703dae3..adeb479e 100644
--- a/web/src/features/sidebars/instructions/index.tsx
+++ b/web/src/features/sidebars/instructions/index.tsx
@@ -2,10 +2,8 @@ import { Button, Group, Modal, Select, Stack, Text, TextInput } from '@mantine/c
 import { useUnit } from 'effector-react';
 import { type ChangeEvent, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuDownload, LuLink2, LuLink2Off, LuPencil, LuPlus, LuSave, LuTrash2, LuUpload } from 'react-icons/lu';
+import { LuLink2, LuLink2Off, LuPencil, LuPlus, LuSave, LuTrash2 } from 'react-icons/lu';
 
-import { getRuntime, patchRuntime } from '../../../api/llm';
-import { getDefaultStPreset } from '../../../api/instructions';
 import { $appSettings, updateAppSettings } from '@model/app-settings';
 import {
 	$instructionEditorDraft,
@@ -25,9 +23,13 @@ import {
 	hasSensitivePresetFields,
 } from '@model/instructions/st-preset';
 import { Drawer } from '@ui/drawer';
+import { EXPORT_FILE_ICON, IMPORT_FILE_ICON } from '@ui/file-transfer-icons';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 import { toaster } from '@ui/toaster';
 
+import { getDefaultStPreset } from '../../../api/instructions';
+import { getRuntime, patchRuntime } from '../../../api/llm';
+
 import { InstructionEditor } from './instruction-editor';
 
 import type { CreateInstructionDraft, InstructionDto } from '../../../api/instructions';
@@ -741,13 +743,13 @@ export const InstructionsSidebar = () => {
 						/>
 						<IconButtonWithTooltip
 							tooltip={t('instructions.presets.actions.import')}
-							icon={<LuUpload size={16} />}
+							icon={<IMPORT_FILE_ICON size={16} />}
 							aria-label={t('instructions.presets.actions.import')}
 							onClick={() => fileInputRef.current?.click()}
 						/>
 						<IconButtonWithTooltip
 							tooltip={t('instructions.presets.actions.export')}
-							icon={<LuDownload size={16} />}
+							icon={<EXPORT_FILE_ICON size={16} />}
 							aria-label={t('instructions.presets.actions.export')}
 							disabled={currentValues?.kind !== 'st_base'}
 							onClick={handleExport}
diff --git a/web/src/features/sidebars/operation-profiles/ui/block-actions.tsx b/web/src/features/sidebars/operation-profiles/ui/block-actions.tsx
index 5e969126..3eeb3159 100644
--- a/web/src/features/sidebars/operation-profiles/ui/block-actions.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/block-actions.tsx
@@ -1,8 +1,9 @@
 import { Group } from '@mantine/core';
 import React, { useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuCopyPlus, LuDownload, LuPlus, LuTrash2, LuUpload } from 'react-icons/lu';
+import { LuCopyPlus, LuPlus, LuTrash2 } from 'react-icons/lu';
 
+import { EXPORT_FILE_ICON, IMPORT_FILE_ICON } from '@ui/file-transfer-icons';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 import { toaster } from '@ui/toaster';
 import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
@@ -72,7 +73,7 @@ export const BlockActions: React.FC<Props> = ({ selected, onCreate, onDuplicate,
 			<IconButtonWithTooltip
 				aria-label={t('operationProfiles.blocks.actions.exportBlock')}
 				tooltip={t('operationProfiles.blocks.actions.exportBlock')}
-				icon={<LuDownload />}
+				icon={<EXPORT_FILE_ICON />}
 				size="input-sm"
 				variant="ghost"
 				tooltipSettings={QUICK_ACTION_TOOLTIP_SETTINGS}
@@ -121,7 +122,7 @@ export const BlockActions: React.FC<Props> = ({ selected, onCreate, onDuplicate,
 			<IconButtonWithTooltip
 				aria-label={t('operationProfiles.blocks.actions.importBlocks')}
 				tooltip={t('operationProfiles.blocks.actions.importBlocks')}
-				icon={<LuUpload />}
+				icon={<IMPORT_FILE_ICON />}
 				size="input-sm"
 				variant="ghost"
 				tooltipSettings={QUICK_ACTION_TOOLTIP_SETTINGS}
diff --git a/web/src/features/sidebars/operation-profiles/ui/profile-actions.tsx b/web/src/features/sidebars/operation-profiles/ui/profile-actions.tsx
index 79e0149f..06bb1edd 100644
--- a/web/src/features/sidebars/operation-profiles/ui/profile-actions.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/profile-actions.tsx
@@ -1,8 +1,9 @@
 import { Group } from '@mantine/core';
 import React, { useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuCopyPlus, LuDownload, LuPlus, LuTrash2, LuUpload } from 'react-icons/lu';
+import { LuCopyPlus, LuPlus, LuTrash2 } from 'react-icons/lu';
 
+import { EXPORT_FILE_ICON, IMPORT_FILE_ICON } from '@ui/file-transfer-icons';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 import { toaster } from '@ui/toaster';
 import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
@@ -72,7 +73,7 @@ export const ProfileActions: React.FC<Props> = ({ selected, onCreate, onDuplicat
 			<IconButtonWithTooltip
 				aria-label={t('operationProfiles.actions.exportProfile')}
 				tooltip={t('operationProfiles.actions.exportProfile')}
-				icon={<LuDownload />}
+				icon={<EXPORT_FILE_ICON />}
 				size="input-sm"
 				variant="ghost"
 				tooltipSettings={QUICK_ACTION_TOOLTIP_SETTINGS}
@@ -121,7 +122,7 @@ export const ProfileActions: React.FC<Props> = ({ selected, onCreate, onDuplicat
 			<IconButtonWithTooltip
 				aria-label={t('operationProfiles.actions.importProfiles')}
 				tooltip={t('operationProfiles.actions.importProfiles')}
-				icon={<LuUpload />}
+				icon={<IMPORT_FILE_ICON />}
 				size="input-sm"
 				variant="ghost"
 				tooltipSettings={QUICK_ACTION_TOOLTIP_SETTINGS}
diff --git a/web/src/features/sidebars/world-info/index.tsx b/web/src/features/sidebars/world-info/index.tsx
index 6f595e30..40a5651d 100644
--- a/web/src/features/sidebars/world-info/index.tsx
+++ b/web/src/features/sidebars/world-info/index.tsx
@@ -3,7 +3,7 @@ import { useMediaQuery } from '@mantine/hooks';
 import { useUnit } from 'effector-react';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuCopy, LuDownload, LuPencilLine, LuPlus, LuRefreshCw, LuTrash2, LuUpload } from 'react-icons/lu';
+import { LuCopy, LuPencilLine, LuPlus, LuRefreshCw, LuTrash2 } from 'react-icons/lu';
 
 import { $currentChat } from '@model/chat-core';
 import {
@@ -32,6 +32,7 @@ import {
 	worldInfoSettingsSaveRequested,
 } from '@model/world-info';
 import { Drawer } from '@ui/drawer';
+import { EXPORT_FILE_ICON, IMPORT_FILE_ICON } from '@ui/file-transfer-icons';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 import { toaster } from '@ui/toaster';
 
@@ -191,8 +192,8 @@ export const WorldInfoSidebar = () => {
 									worldInfoBookDuplicateRequested({ id: selectedId });
 								}}
 							/>
-							<IconButtonWithTooltip tooltip={t('common.import')} icon={<LuUpload />} aria-label={t('worldInfo.actions.importBook')} onClick={() => fileInputRef.current?.click()} />
-							<IconButtonWithTooltip tooltip={t('common.export')} icon={<LuDownload />} aria-label={t('worldInfo.actions.exportBook')} disabled={!selectedId} onClick={() => void handleExport()} />
+							<IconButtonWithTooltip tooltip={t('common.import')} icon={<IMPORT_FILE_ICON />} aria-label={t('worldInfo.actions.importBook')} onClick={() => fileInputRef.current?.click()} />
+							<IconButtonWithTooltip tooltip={t('common.export')} icon={<EXPORT_FILE_ICON />} aria-label={t('worldInfo.actions.exportBook')} disabled={!selectedId} onClick={() => void handleExport()} />
 							<IconButtonWithTooltip
 								tooltip={t('worldInfo.actions.openEditor')}
 								icon={<LuPencilLine />}
diff --git a/web/src/ui/file-transfer-icons.test.ts b/web/src/ui/file-transfer-icons.test.ts
new file mode 100644
index 00000000..9706aef4
--- /dev/null
+++ b/web/src/ui/file-transfer-icons.test.ts
@@ -0,0 +1,14 @@
+import { LuDownload, LuUpload } from 'react-icons/lu';
+import { describe, expect, it } from 'vitest';
+
+import { getFileTransferIcon } from './file-transfer-icons';
+
+describe('getFileTransferIcon', () => {
+	it('uses the incoming icon for imports', () => {
+		expect(getFileTransferIcon('import')).toBe(LuDownload);
+	});
+
+	it('uses the outgoing icon for exports', () => {
+		expect(getFileTransferIcon('export')).toBe(LuUpload);
+	});
+});
diff --git a/web/src/ui/file-transfer-icons.ts b/web/src/ui/file-transfer-icons.ts
new file mode 100644
index 00000000..e78b0918
--- /dev/null
+++ b/web/src/ui/file-transfer-icons.ts
@@ -0,0 +1,10 @@
+import { LuDownload, LuUpload } from 'react-icons/lu';
+
+export type FileTransferAction = 'import' | 'export';
+
+export const IMPORT_FILE_ICON = LuDownload;
+export const EXPORT_FILE_ICON = LuUpload;
+
+export function getFileTransferIcon(action: FileTransferAction) {
+	return action === 'import' ? IMPORT_FILE_ICON : EXPORT_FILE_ICON;
+}

From 9a2757be9620a95f88cca75998bde89d2c82e302 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Fri, 13 Mar 2026 01:12:12 +0300
Subject: [PATCH 13/54] fix: tests

---
 server/src/e2e/full-matrix.e2e.spec.ts        |  4 +-
 .../operations/execute-operations-phase.ts    | 49 +++++++++++++++++--
 .../operation-profile-resolver.test.ts        | 16 +++---
 .../operations/operation-profile-resolver.ts  | 19 ++++++-
 4 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/server/src/e2e/full-matrix.e2e.spec.ts b/server/src/e2e/full-matrix.e2e.spec.ts
index 48106f8b..1b412ef5 100644
--- a/server/src/e2e/full-matrix.e2e.spec.ts
+++ b/server/src/e2e/full-matrix.e2e.spec.ts
@@ -224,7 +224,7 @@ describe("backend e2e full matrix", () => {
       baseUrl,
       method: "POST",
       path: "/api/instructions",
-      body: { name: "Matrix instruction", templateText: "System prompt" },
+      body: { name: "Matrix instruction", kind: "basic", templateText: "System prompt" },
     });
     expect(instructionRes.status).toBe(200);
     expect(
@@ -233,7 +233,7 @@ describe("backend e2e full matrix", () => {
           baseUrl,
           method: "PUT",
           path: `/api/instructions/${instructionRes.data.data.id}`,
-          body: { name: "Matrix instruction updated" },
+          body: { kind: "basic", name: "Matrix instruction updated" },
         })
       ).status
     ).toBe(200);
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
index 37247c10..579e9705 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
@@ -26,6 +26,24 @@ type PreviewState = {
   assistantText: string;
 };
 
+function getRuntimeArtifactKey(params: {
+  artifactId: string;
+  tag: string;
+}): string {
+  return params.tag;
+}
+
+function readArtifactValue(params: {
+  artifacts: Record<string, { value: unknown; history: unknown[] }>;
+  artifactId: string;
+  tag: string;
+}): { value: unknown; history: unknown[] } | undefined {
+  return (
+    params.artifacts[getRuntimeArtifactKey(params)] ??
+    params.artifacts[params.artifactId]
+  );
+}
+
 function resolvePromptSystem(messages: PromptDraftMessage[]): string {
   return messages
     .filter((m) => m.role === "system")
@@ -126,7 +144,11 @@ function mapArtifactsByOpId(
 ): Record<string, { value: unknown; history: unknown[] }> {
   const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
   for (const op of operations) {
-    const artifact = artifacts[op.config.params.artifact.artifactId];
+    const artifact = readArtifactValue({
+      artifacts,
+      artifactId: op.config.params.artifact.artifactId,
+      tag: op.config.params.artifact.tag,
+    });
     if (!artifact) continue;
     mapped[op.opId] = { value: artifact.value, history: [...artifact.history] };
   }
@@ -139,7 +161,11 @@ function mapArtifactsForTemplate(
 ): Record<string, { value: unknown; history: unknown[] }> {
   const mapped: Record<string, { value: unknown; history: unknown[] }> = {};
   for (const op of operations) {
-    const artifact = artifacts[op.config.params.artifact.artifactId];
+    const artifact = readArtifactValue({
+      artifacts,
+      artifactId: op.config.params.artifact.artifactId,
+      tag: op.config.params.artifact.tag,
+    });
     if (!artifact) continue;
     const snapshot = { value: artifact.value, history: [...artifact.history] };
     mapped[op.config.params.artifact.tag] = snapshot;
@@ -148,6 +174,17 @@ function mapArtifactsForTemplate(
   return mapped;
 }
 
+function mapKnownArtifacts(
+  artifacts: Record<string, { value: unknown; history: unknown[] }>
+): Record<string, { value: unknown; history: unknown[] }> {
+  return Object.fromEntries(
+    Object.entries(artifacts).map(([key, value]) => [
+      key,
+      { value: value.value, history: [...value.history] },
+    ])
+  );
+}
+
 function buildTemplateContext(
   base: InstructionRenderContext,
   state: PreviewState,
@@ -155,6 +192,7 @@ function buildTemplateContext(
 ): InstructionRenderContext {
   const art = {
     ...(base.art ?? {}),
+    ...mapKnownArtifacts(state.artifacts),
     ...mapArtifactsForTemplate(operations, state.artifacts),
   };
   return {
@@ -192,7 +230,10 @@ function buildLiquidContextSnapshot(params: {
     now: params.base.now,
     promptSystem: resolvePromptSystem(params.state.messages),
     messages: params.state.messages.map((m) => ({ role: m.role, content: m.content })),
-    art: mapArtifactsForTemplate(params.operations, params.state.artifacts),
+    art: {
+      ...mapKnownArtifacts(params.state.artifacts),
+      ...mapArtifactsForTemplate(params.operations, params.state.artifacts),
+    },
     artByOpId: params.base.artByOpId as Record<string, { value: unknown; history: unknown[] }> | undefined,
   };
 }
@@ -490,7 +531,7 @@ export async function executeOperationsPhase(params: {
               {
                 type: "artifact.upsert",
                 opId: op.opId,
-                artifactId: artifact.artifactId,
+                artifactId: getRuntimeArtifactKey(artifact),
                 format: artifact.format,
                 persistence: artifact.persistence,
                 writeMode: artifact.writeMode,
diff --git a/server/src/services/operations/operation-profile-resolver.test.ts b/server/src/services/operations/operation-profile-resolver.test.ts
index c494a830..4c4633ad 100644
--- a/server/src/services/operations/operation-profile-resolver.test.ts
+++ b/server/src/services/operations/operation-profile-resolver.test.ts
@@ -48,12 +48,12 @@ function makeBlock(params: {
               rawParams: {
                 output: {
                   type: "artifacts",
-                  writeArtifact: {
-                    tag: params.artifactTag ?? `${params.blockId.replace(/-/g, "_")}_state`,
-                    persistence: "run_only",
-                    usage: "internal",
-                    semantics: "intermediate",
-                  },
+                    writeArtifact: {
+                      tag: params.artifactTag ?? `block_${params.blockId.replace(/-/g, "_")}_state`,
+                      persistence: "run_only",
+                      usage: "internal",
+                      semantics: "intermediate",
+                    },
                 } satisfies LegacyOperationOutput,
               },
             }),
@@ -170,6 +170,8 @@ describe("operation profile resolver", () => {
       updatedAt: now,
     };
 
-    await expect(resolveCompiledOperationProfile(profile)).rejects.toThrow(/duplicate artifactId in compiled profile/i);
+    await expect(resolveCompiledOperationProfile(profile)).rejects.toThrow(
+      /duplicate artifact (tag|id) in compiled profile/i
+    );
   });
 });
diff --git a/server/src/services/operations/operation-profile-resolver.ts b/server/src/services/operations/operation-profile-resolver.ts
index 6924576c..0a4f8162 100644
--- a/server/src/services/operations/operation-profile-resolver.ts
+++ b/server/src/services/operations/operation-profile-resolver.ts
@@ -4,10 +4,13 @@ import { getOperationBlockById } from "./operation-blocks-repository";
 import { validateCompiledProfileArtifactWriters } from "./operation-block-validator";
 
 import type {
+  OperationArtifactConfig,
   OperationBlock,
   OperationInProfile,
   OperationProfile,
+  OperationKind,
 } from "@shared/types/operation-profiles";
+import { buildOperationArtifactId } from "@shared/types/operation-profiles";
 
 const ORDER_BUCKET = 1_000_000;
 
@@ -32,6 +35,10 @@ function mapOperationToRuntime(params: {
   const opId = `${blockPrefix}${params.op.opId}`;
   const dependsOn = params.op.config.dependsOn?.map((dep) => `${blockPrefix}${dep}`);
   const order = params.blockOrderIndex * ORDER_BUCKET + normalizeOrder(params.op.config.order);
+  const artifact: OperationArtifactConfig = {
+    ...params.op.config.params.artifact,
+    artifactId: buildOperationArtifactId(opId),
+  };
   return {
     ...params.op,
     opId,
@@ -39,8 +46,18 @@ function mapOperationToRuntime(params: {
       ...params.op.config,
       order,
       dependsOn: dependsOn?.length ? dependsOn : undefined,
+      params:
+        params.op.kind === "template"
+          ? {
+              ...params.op.config.params,
+              artifact,
+            }
+          : {
+              ...params.op.config.params,
+              artifact,
+            },
     },
-  } as OperationInProfile;
+  } as Extract<OperationInProfile, { kind: OperationKind }>;
 }
 
 async function resolveBlocks(

From 0d375bbdf000e7dad49b8bd4c8f1ab9a421de9a7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Fri, 13 Mar 2026 01:13:25 +0300
Subject: [PATCH 14/54] fix: lint

---
 server/src/api/chat-entries.api.ts             |  4 ++--
 server/src/api/files/controllers.ts            |  2 +-
 server/src/api/instructions.core.api.ts        |  2 +-
 server/src/api/legacy-route-wrappers.test.ts   |  1 +
 server/src/api/llm.api.ts                      |  6 +++---
 server/src/app.ts                              |  2 +-
 .../chat-runtime/chat-entry-helpers.ts         |  2 +-
 .../chat-runtime/chat-generation-helpers.ts    | 10 +++++-----
 .../use-cases/batch-update-entry-parts.ts      |  1 -
 .../chat-entry-mutation-use-cases.test.ts      |  2 +-
 .../chat-generation-use-cases.test.ts          |  2 +-
 .../use-cases/continue-generation.ts           |  5 ++---
 .../create-entry-and-start-generation.ts       |  7 +++----
 .../chat-runtime/use-cases/get-chat-entries.ts | 14 +++++++-------
 .../get-latest-world-info-activations.ts       |  4 ++--
 .../use-cases/get-prompt-diagnostics.ts        |  1 -
 .../use-cases/manual-edit-entry.ts             |  5 ++---
 .../use-cases/regenerate-assistant-variant.ts  |  3 +--
 .../use-cases/set-entry-prompt-visibility.ts   |  1 -
 .../use-cases/undo-part-canonicalization.ts    |  1 -
 .../create-chat-from-entity-profile.ts         |  2 +-
 .../use-cases/import-operation-profiles.ts     |  2 +-
 .../use-cases/set-active-operation-profile.ts  |  2 +-
 .../use-cases/replace-world-info-bindings.ts   |  1 +
 server/src/core/middleware/error-handler.ts    |  1 +
 .../middleware/request-lifecycle-logger.ts     |  5 +++--
 server/src/core/services/base-service.ts       |  2 +-
 server/src/routes/generate-routes.ts           |  3 ++-
 .../src/services/chat-core/chats-repository.ts |  3 ++-
 .../chat-core/entity-profiles-repository.ts    |  3 ++-
 ...eration-control-service.integration.test.ts |  5 +++--
 .../chat-core/generation-control-service.ts    | 13 +++++++------
 .../chat-core/generations-repository.ts        |  3 ++-
 .../services/chat-core/instruction-st-base.ts  | 11 ++++++-----
 .../chat-core/instructions-repository.ts       |  3 ++-
 .../chat-core/user-persons-repository.ts       |  3 ++-
 .../chat-entry-parts/entries-repository.ts     |  3 ++-
 .../chat-entry-parts/parts-repository.ts       |  3 ++-
 .../chat-entry-parts/variants-repository.ts    |  3 ++-
 .../profile-session-artifact-store.ts          |  5 +++--
 .../operations/effect-handlers/turn-effects.ts |  2 +-
 .../execute-operations-phase.test.ts           | 10 +++++-----
 .../operations-flow.integration.test.ts        | 10 +++++-----
 .../orchestration/run-operation-hook-phase.ts  |  5 ++---
 .../orchestration/run-state-helpers.ts         |  4 ++--
 .../persist/finalize-run.integration.test.ts   |  2 +-
 .../chat-generation-v3/persist/finalize-run.ts |  2 +-
 .../run-chat-generation-v3.ts                  |  7 ++++---
 .../chat-runtime-state-repository.test.ts      |  1 +
 .../runtime/chat-runtime-state-repository.ts   |  3 ++-
 .../runtime/operation-runtime-state.test.ts    |  1 +
 .../runtime/operation-runtime-state.ts         |  3 ++-
 .../src/services/llm/llm-presets-repository.ts |  3 ++-
 server/src/services/llm/llm-repository.ts      |  3 ++-
 .../operation-block-validator.test.ts          |  2 +-
 .../operations/operation-block-validator.ts    | 18 +++++++++---------
 .../operations/operation-blocks-repository.ts  |  3 ++-
 .../operation-profile-resolver.test.ts         |  8 ++++----
 .../operations/operation-profile-resolver.ts   |  5 +++--
 .../operation-profiles-repository.ts           |  3 ++-
 .../template-operations-runtime.test.ts        | 12 ++++++------
 server/src/services/rag.service.ts             |  3 ++-
 .../services/rag/chroma-rag.service.test.ts    |  2 +-
 server/src/services/rag/chroma-rag.service.ts  |  9 ++++++---
 .../services/ui-theme/ui-theme-repository.ts   |  3 ++-
 .../world-info/world-info-repositories.ts      |  3 ++-
 web/src/api/chat-entry-parts.ts                |  2 +-
 .../llm-provider/llm-preset-manager.tsx        |  3 ++-
 .../instructions/instruction-editor.tsx        |  2 +-
 .../form/operation-profile-form-mapping.ts     |  6 +++---
 .../sidebars/settings/rag-settings-tab.tsx     |  3 ++-
 .../world-info/world-info-editor-modal.tsx     |  2 +-
 web/src/model/instructions/index.ts            |  1 +
 web/src/model/instructions/st-preset.ts        |  1 +
 74 files changed, 163 insertions(+), 135 deletions(-)

diff --git a/server/src/api/chat-entries.api.ts b/server/src/api/chat-entries.api.ts
index 2b85dab8..4e5edc75 100644
--- a/server/src/api/chat-entries.api.ts
+++ b/server/src/api/chat-entries.api.ts
@@ -6,8 +6,6 @@ import { HttpError } from "@core/middleware/error-handler";
 import { validate } from "@core/middleware/validate";
 import { initSse, type SseWriter } from "@core/sse/sse";
 
-import type { BatchUpdateEntryPartsBody as ChatRuntimeBatchUpdateEntryPartsBody } from "../application/chat-runtime/chat-entry-helpers";
-import type { ChatGenerationSession } from "../application/chat-runtime/contracts";
 import { batchUpdateEntryParts } from "../application/chat-runtime/use-cases/batch-update-entry-parts";
 import { continueGeneration } from "../application/chat-runtime/use-cases/continue-generation";
 import { createEntryAndStartGeneration } from "../application/chat-runtime/use-cases/create-entry-and-start-generation";
@@ -31,6 +29,8 @@ import {
 } from "../services/chat-entry-parts/entries-repository";
 import { softDeletePart } from "../services/chat-entry-parts/parts-repository";
 
+import type { BatchUpdateEntryPartsBody as ChatRuntimeBatchUpdateEntryPartsBody } from "../application/chat-runtime/chat-entry-helpers";
+import type { ChatGenerationSession } from "../application/chat-runtime/contracts";
 import type { RunEvent } from "../services/chat-generation-v3/contracts";
 
 const router = express.Router();
diff --git a/server/src/api/files/controllers.ts b/server/src/api/files/controllers.ts
index 7f3280d7..b1c3d4e4 100644
--- a/server/src/api/files/controllers.ts
+++ b/server/src/api/files/controllers.ts
@@ -1,8 +1,8 @@
 import fs from "fs/promises";
+import { randomUUID as uuidv4 } from "node:crypto";
 import path from "path";
 
 import sharp from "sharp";
-import { randomUUID as uuidv4 } from "node:crypto";
 
 import { resolveSafePath } from "@core/files/safe-path";
 import { type AsyncRequestHandler } from "@core/middleware/async-handler";
diff --git a/server/src/api/instructions.core.api.ts b/server/src/api/instructions.core.api.ts
index 16d2cdfa..74651525 100644
--- a/server/src/api/instructions.core.api.ts
+++ b/server/src/api/instructions.core.api.ts
@@ -12,6 +12,7 @@ import {
   updateInstructionBodySchema,
 } from "../chat-core/schemas";
 import { getRequestOwnerId } from "../core/request-context/request-context";
+import { loadBuiltInSillyTavernPreset } from "../services/chat-core/instruction-st-base";
 import {
   createInstruction,
   deleteInstruction,
@@ -23,7 +24,6 @@ import {
   buildInstructionRenderContext,
   resolveAndApplyWorldInfoToTemplateContext,
 } from "../services/chat-core/prompt-template-context";
-import { loadBuiltInSillyTavernPreset } from "../services/chat-core/instruction-st-base";
 import {
   renderLiquidTemplate,
   validateLiquidTemplate,
diff --git a/server/src/api/legacy-route-wrappers.test.ts b/server/src/api/legacy-route-wrappers.test.ts
index 3fa3f71b..cc8bdbbb 100644
--- a/server/src/api/legacy-route-wrappers.test.ts
+++ b/server/src/api/legacy-route-wrappers.test.ts
@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import * as path from "node:path";
+
 import { afterEach, describe, expect, test } from "vitest";
 
 import { bootstrapApp, createApp } from "../app";
diff --git a/server/src/api/llm.api.ts b/server/src/api/llm.api.ts
index 176e25a0..0de2a560 100644
--- a/server/src/api/llm.api.ts
+++ b/server/src/api/llm.api.ts
@@ -4,7 +4,6 @@ import { z } from "zod";
 import { asyncHandler } from "@core/middleware/async-handler";
 import { HttpError } from "@core/middleware/error-handler";
 import { validate } from "@core/middleware/validate";
-import { updateLlmRuntime } from "../application/llm/use-cases/update-llm-runtime";
 import {
   llmProviderDefinitions,
   openAiCompatibleConfigSchema,
@@ -24,8 +23,9 @@ import {
   upsertRuntime,
   updateToken,
 } from "@services/llm/llm-repository";
-import { getModels } from "@services/llm/llm-service";
-import { checkProviderConnection } from "@services/llm/llm-service";
+import { getModels , checkProviderConnection } from "@services/llm/llm-service";
+
+import { updateLlmRuntime } from "../application/llm/use-cases/update-llm-runtime";
 
 const router = express.Router();
 
diff --git a/server/src/app.ts b/server/src/app.ts
index 02c4bbab..e117a700 100644
--- a/server/src/app.ts
+++ b/server/src/app.ts
@@ -7,9 +7,9 @@ import morgan from "morgan";
 import { routes } from "./api/_routes_";
 import staticRouter from "./api/static.api";
 import { runBackendBootstrap } from "./core/bootstrap/bootstrap-coordinator";
+import { structuredLogger } from "./core/logging/structured-logger";
 import { errorHandler } from "./core/middleware/error-handler";
 import { requestLifecycleLogger } from "./core/middleware/request-lifecycle-logger";
-import { structuredLogger } from "./core/logging/structured-logger";
 import { requestContextMiddleware } from "./core/request-context/request-context";
 
 export type BootstrapAppOptions = {
diff --git a/server/src/application/chat-runtime/chat-entry-helpers.ts b/server/src/application/chat-runtime/chat-entry-helpers.ts
index 26da5d8d..feebe3b6 100644
--- a/server/src/application/chat-runtime/chat-entry-helpers.ts
+++ b/server/src/application/chat-runtime/chat-entry-helpers.ts
@@ -1,8 +1,8 @@
 import { HttpError } from "@core/middleware/error-handler";
 
+import { renderLiquidTemplate } from "../../services/chat-core/prompt-template-renderer";
 import { getUiProjection } from "../../services/chat-entry-parts/projection";
 import { normalizePromptDiagnosticsDebugJson } from "../../services/chat-generation-v3/prompt/generation-debug-payload";
-import { renderLiquidTemplate } from "../../services/chat-core/prompt-template-renderer";
 
 import type { GenerationWithDebugDto } from "../../services/chat-core/generations-repository";
 import type { InstructionRenderContext } from "../../services/chat-core/prompt-template-renderer";
diff --git a/server/src/application/chat-runtime/chat-generation-helpers.ts b/server/src/application/chat-runtime/chat-generation-helpers.ts
index e748f5a0..a75024ce 100644
--- a/server/src/application/chat-runtime/chat-generation-helpers.ts
+++ b/server/src/application/chat-runtime/chat-generation-helpers.ts
@@ -1,3 +1,8 @@
+import { getGenerationByIdWithDebug } from "../../services/chat-core/generations-repository";
+import {
+  getActiveVariantWithParts,
+  listEntries,
+} from "../../services/chat-entry-parts/entries-repository";
 import { createPart } from "../../services/chat-entry-parts/parts-repository";
 import {
   createVariant,
@@ -6,11 +11,6 @@ import {
   listEntryVariants,
   updateVariantDerived,
 } from "../../services/chat-entry-parts/variants-repository";
-import {
-  getActiveVariantWithParts,
-  listEntries,
-} from "../../services/chat-entry-parts/entries-repository";
-import { getGenerationByIdWithDebug } from "../../services/chat-core/generations-repository";
 
 import { pickPreviousUserEntries, resolveContinueUserTurnTarget } from "./chat-entry-helpers";
 
diff --git a/server/src/application/chat-runtime/use-cases/batch-update-entry-parts.ts b/server/src/application/chat-runtime/use-cases/batch-update-entry-parts.ts
index c83eb21f..08274021 100644
--- a/server/src/application/chat-runtime/use-cases/batch-update-entry-parts.ts
+++ b/server/src/application/chat-runtime/use-cases/batch-update-entry-parts.ts
@@ -2,7 +2,6 @@ import { HttpError } from "@core/middleware/error-handler";
 
 import { getActiveVariantWithParts, getEntryById } from "../../../services/chat-entry-parts/entries-repository";
 import { applyPartMutableBatchPatches } from "../../../services/chat-entry-parts/parts-repository";
-
 import {
   assertBatchUpdateVariantIsActive,
   buildBatchUpdatePartPlan,
diff --git a/server/src/application/chat-runtime/use-cases/chat-entry-mutation-use-cases.test.ts b/server/src/application/chat-runtime/use-cases/chat-entry-mutation-use-cases.test.ts
index 27ac1c7e..64cdb188 100644
--- a/server/src/application/chat-runtime/use-cases/chat-entry-mutation-use-cases.test.ts
+++ b/server/src/application/chat-runtime/use-cases/chat-entry-mutation-use-cases.test.ts
@@ -17,8 +17,8 @@ import { initDb, resetDbForTests } from "../../../db/client";
 import { chatBranches, chats, entityProfiles } from "../../../db/schema";
 import { createTempDataDir, removeTempDataDir } from "../../../e2e/helpers/tmp-dir";
 import * as entriesRepository from "../../../services/chat-entry-parts/entries-repository";
-import * as partsRepository from "../../../services/chat-entry-parts/parts-repository";
 import { createEntryWithVariant, getActiveVariantWithParts, getEntryById } from "../../../services/chat-entry-parts/entries-repository";
+import * as partsRepository from "../../../services/chat-entry-parts/parts-repository";
 import { createPart, getPartById } from "../../../services/chat-entry-parts/parts-repository";
 import {
   createVariant,
diff --git a/server/src/application/chat-runtime/use-cases/chat-generation-use-cases.test.ts b/server/src/application/chat-runtime/use-cases/chat-generation-use-cases.test.ts
index c113123d..86592009 100644
--- a/server/src/application/chat-runtime/use-cases/chat-generation-use-cases.test.ts
+++ b/server/src/application/chat-runtime/use-cases/chat-generation-use-cases.test.ts
@@ -33,8 +33,8 @@ vi.mock("../../../services/chat-core/generations-repository", async () => {
 
 import { eq } from "drizzle-orm";
 
-import { resetDbForTests, initDb } from "../../../db/client";
 import { applyMigrations } from "../../../db/apply-migrations";
+import { resetDbForTests, initDb } from "../../../db/client";
 import { chatBranches, chatEntries, chats, entityProfiles, entryVariants, variantParts } from "../../../db/schema";
 import { createTempDataDir, removeTempDataDir } from "../../../e2e/helpers/tmp-dir";
 import { createEntryWithVariant, getEntryById } from "../../../services/chat-entry-parts/entries-repository";
diff --git a/server/src/application/chat-runtime/use-cases/continue-generation.ts b/server/src/application/chat-runtime/use-cases/continue-generation.ts
index 08a08149..2d1ad3ec 100644
--- a/server/src/application/chat-runtime/use-cases/continue-generation.ts
+++ b/server/src/application/chat-runtime/use-cases/continue-generation.ts
@@ -1,5 +1,6 @@
 import { HttpError } from "@core/middleware/error-handler";
 
+import { withDbTransaction } from "../../../db/client";
 import { getChatById } from "../../../services/chat-core/chats-repository";
 import { getBranchCurrentTurn, incrementBranchTurn } from "../../../services/chat-entry-parts/branch-turn-repository";
 import {
@@ -8,13 +9,11 @@ import {
   listEntries,
 } from "../../../services/chat-entry-parts/entries-repository";
 import { createPart } from "../../../services/chat-entry-parts/parts-repository";
-import { withDbTransaction } from "../../../db/client";
-
+import { resolveContinueUserTurnTarget } from "../chat-entry-helpers";
 import {
   createAssistantReasoningPart,
   finalizeChatGenerationArtifacts,
 } from "../chat-generation-helpers";
-import { resolveContinueUserTurnTarget } from "../chat-entry-helpers";
 import { buildChatGenerationSession } from "../generation-session";
 
 import type { ChatGenerationSession } from "../contracts";
diff --git a/server/src/application/chat-runtime/use-cases/create-entry-and-start-generation.ts b/server/src/application/chat-runtime/use-cases/create-entry-and-start-generation.ts
index 505334bf..dc69a0f8 100644
--- a/server/src/application/chat-runtime/use-cases/create-entry-and-start-generation.ts
+++ b/server/src/application/chat-runtime/use-cases/create-entry-and-start-generation.ts
@@ -1,21 +1,20 @@
 import { HttpError } from "@core/middleware/error-handler";
 
+import { withDbTransaction } from "../../../db/client";
+import { getChatById } from "../../../services/chat-core/chats-repository";
 import {
   buildInstructionRenderContext,
   resolveAndApplyWorldInfoToTemplateContext,
 } from "../../../services/chat-core/prompt-template-context";
 import { getSelectedUserPerson } from "../../../services/chat-core/user-persons-repository";
-import { getChatById } from "../../../services/chat-core/chats-repository";
 import { getBranchCurrentTurn, incrementBranchTurn } from "../../../services/chat-entry-parts/branch-turn-repository";
 import { createEntryWithVariant } from "../../../services/chat-entry-parts/entries-repository";
 import { createPart } from "../../../services/chat-entry-parts/parts-repository";
-import { withDbTransaction } from "../../../db/client";
-
+import { buildUserEntryMeta, renderUserInputWithLiquid } from "../chat-entry-helpers";
 import {
   createAssistantReasoningPart,
   finalizeChatGenerationArtifacts,
 } from "../chat-generation-helpers";
-import { buildUserEntryMeta, renderUserInputWithLiquid } from "../chat-entry-helpers";
 import { buildChatGenerationSession } from "../generation-session";
 
 import type { ChatGenerationSession } from "../contracts";
diff --git a/server/src/application/chat-runtime/use-cases/get-chat-entries.ts b/server/src/application/chat-runtime/use-cases/get-chat-entries.ts
index 6620e671..209723c7 100644
--- a/server/src/application/chat-runtime/use-cases/get-chat-entries.ts
+++ b/server/src/application/chat-runtime/use-cases/get-chat-entries.ts
@@ -1,11 +1,5 @@
 import { HttpError } from "@core/middleware/error-handler";
 
-import {
-  buildEntryPromptUsage,
-  buildPromptApproxTokensByEntryId,
-  PROMPT_USAGE_HISTORY_LIMIT,
-  type EntryPromptUsage,
-} from "../chat-entry-helpers";
 import { getChatById } from "../../../services/chat-core/chats-repository";
 import { rerenderGreetingTemplatesIfPreplay } from "../../../services/chat-core/greeting-template-rerender";
 import { getBranchCurrentTurn } from "../../../services/chat-entry-parts/branch-turn-repository";
@@ -14,8 +8,14 @@ import {
   listEntriesWithActiveVariantsPage,
   type EntriesPageInfo,
 } from "../../../services/chat-entry-parts/entries-repository";
-import { serializePart } from "../../../services/chat-entry-parts/prompt-serializers";
 import { getPromptProjectionWithEntryIds } from "../../../services/chat-entry-parts/projection";
+import { serializePart } from "../../../services/chat-entry-parts/prompt-serializers";
+import {
+  buildEntryPromptUsage,
+  buildPromptApproxTokensByEntryId,
+  PROMPT_USAGE_HISTORY_LIMIT,
+  type EntryPromptUsage,
+} from "../chat-entry-helpers";
 
 import type { Entry, Variant } from "@shared/types/chat-entry-parts";
 
diff --git a/server/src/application/chat-runtime/use-cases/get-latest-world-info-activations.ts b/server/src/application/chat-runtime/use-cases/get-latest-world-info-activations.ts
index 1d84d5c8..01a79eb4 100644
--- a/server/src/application/chat-runtime/use-cases/get-latest-world-info-activations.ts
+++ b/server/src/application/chat-runtime/use-cases/get-latest-world-info-activations.ts
@@ -1,11 +1,11 @@
 import { HttpError } from "@core/middleware/error-handler";
 
+import { getChatById } from "../../../services/chat-core/chats-repository";
+import { getLatestGenerationByChatBranchWithDebug } from "../../../services/chat-core/generations-repository";
 import {
   buildLatestWorldInfoActivationsFromGeneration,
   emptyLatestWorldInfoActivationsResponse,
 } from "../chat-entry-helpers";
-import { getChatById } from "../../../services/chat-core/chats-repository";
-import { getLatestGenerationByChatBranchWithDebug } from "../../../services/chat-core/generations-repository";
 
 import type { LatestWorldInfoActivationsResponse } from "../chat-entry-helpers";
 
diff --git a/server/src/application/chat-runtime/use-cases/get-prompt-diagnostics.ts b/server/src/application/chat-runtime/use-cases/get-prompt-diagnostics.ts
index 68a612f1..634cac9e 100644
--- a/server/src/application/chat-runtime/use-cases/get-prompt-diagnostics.ts
+++ b/server/src/application/chat-runtime/use-cases/get-prompt-diagnostics.ts
@@ -5,7 +5,6 @@ import {
 } from "../../../services/chat-core/generations-repository";
 import { getEntryById } from "../../../services/chat-entry-parts/entries-repository";
 import { getVariantById } from "../../../services/chat-entry-parts/variants-repository";
-
 import {
   buildPromptDiagnosticsFromDebug,
   buildPromptDiagnosticsFromSnapshot,
diff --git a/server/src/application/chat-runtime/use-cases/manual-edit-entry.ts b/server/src/application/chat-runtime/use-cases/manual-edit-entry.ts
index e063b5b3..837d22b4 100644
--- a/server/src/application/chat-runtime/use-cases/manual-edit-entry.ts
+++ b/server/src/application/chat-runtime/use-cases/manual-edit-entry.ts
@@ -1,10 +1,11 @@
 import { HttpError } from "@core/middleware/error-handler";
 
+import { withDbTransaction } from "../../../db/client";
+import { getChatById } from "../../../services/chat-core/chats-repository";
 import {
   buildInstructionRenderContext,
   resolveAndApplyWorldInfoToTemplateContext,
 } from "../../../services/chat-core/prompt-template-context";
-import { getChatById } from "../../../services/chat-core/chats-repository";
 import { getBranchCurrentTurn } from "../../../services/chat-entry-parts/branch-turn-repository";
 import {
   getActiveVariantWithParts,
@@ -12,8 +13,6 @@ import {
   updateEntryMeta,
 } from "../../../services/chat-entry-parts/entries-repository";
 import { applyManualEditToPart } from "../../../services/chat-entry-parts/parts-repository";
-import { withDbTransaction } from "../../../db/client";
-
 import {
   isRecord,
   renderUserInputWithLiquid,
diff --git a/server/src/application/chat-runtime/use-cases/regenerate-assistant-variant.ts b/server/src/application/chat-runtime/use-cases/regenerate-assistant-variant.ts
index 79c943a3..8f02e86c 100644
--- a/server/src/application/chat-runtime/use-cases/regenerate-assistant-variant.ts
+++ b/server/src/application/chat-runtime/use-cases/regenerate-assistant-variant.ts
@@ -1,5 +1,6 @@
 import { HttpError } from "@core/middleware/error-handler";
 
+import { withDbTransaction } from "../../../db/client";
 import { getChatById } from "../../../services/chat-core/chats-repository";
 import {
   getBranchCurrentTurn,
@@ -8,8 +9,6 @@ import {
 import { getEntryById } from "../../../services/chat-entry-parts/entries-repository";
 import { createPart } from "../../../services/chat-entry-parts/parts-repository";
 import { selectActiveVariant } from "../../../services/chat-entry-parts/variants-repository";
-import { withDbTransaction } from "../../../db/client";
-
 import {
   createAssistantReasoningPart,
   createDetachedGenerationVariant,
diff --git a/server/src/application/chat-runtime/use-cases/set-entry-prompt-visibility.ts b/server/src/application/chat-runtime/use-cases/set-entry-prompt-visibility.ts
index c9a602ed..d1b3ec01 100644
--- a/server/src/application/chat-runtime/use-cases/set-entry-prompt-visibility.ts
+++ b/server/src/application/chat-runtime/use-cases/set-entry-prompt-visibility.ts
@@ -1,7 +1,6 @@
 import { HttpError } from "@core/middleware/error-handler";
 
 import { getEntryById, updateEntryMeta } from "../../../services/chat-entry-parts/entries-repository";
-
 import { mergeEntryPromptVisibilityMeta } from "../chat-entry-helpers";
 
 export type SetEntryPromptVisibilityInput = {
diff --git a/server/src/application/chat-runtime/use-cases/undo-part-canonicalization.ts b/server/src/application/chat-runtime/use-cases/undo-part-canonicalization.ts
index f138b2f6..055da6c6 100644
--- a/server/src/application/chat-runtime/use-cases/undo-part-canonicalization.ts
+++ b/server/src/application/chat-runtime/use-cases/undo-part-canonicalization.ts
@@ -3,7 +3,6 @@ import { HttpError } from "@core/middleware/error-handler";
 import { withDbTransaction } from "../../../db/client";
 import { getPartWithVariantContextById, softDeletePart } from "../../../services/chat-entry-parts/parts-repository";
 import { listEntryVariants } from "../../../services/chat-entry-parts/variants-repository";
-
 import {
   isCanonicalizationPart,
   resolveActiveUndoCascade,
diff --git a/server/src/application/entity-profiles/use-cases/create-chat-from-entity-profile.ts b/server/src/application/entity-profiles/use-cases/create-chat-from-entity-profile.ts
index b9c2839a..a48d5691 100644
--- a/server/src/application/entity-profiles/use-cases/create-chat-from-entity-profile.ts
+++ b/server/src/application/entity-profiles/use-cases/create-chat-from-entity-profile.ts
@@ -1,6 +1,5 @@
 import { HttpError } from "@core/middleware/error-handler";
 
-import { renderGreetingTemplateSinglePass } from "../greeting-template";
 import {
   createChat,
   createImportedAssistantMessage,
@@ -17,6 +16,7 @@ import {
   createVariant,
   updateVariantDerived,
 } from "../../../services/chat-entry-parts/variants-repository";
+import { renderGreetingTemplateSinglePass } from "../greeting-template";
 
 export type CreateChatFromEntityProfileInput = {
   entityProfileId: string;
diff --git a/server/src/application/operations/use-cases/import-operation-profiles.ts b/server/src/application/operations/use-cases/import-operation-profiles.ts
index 5d1e071a..f3aff114 100644
--- a/server/src/application/operations/use-cases/import-operation-profiles.ts
+++ b/server/src/application/operations/use-cases/import-operation-profiles.ts
@@ -1,9 +1,9 @@
-import { validateOperationProfileImport } from "../../../services/operations/operation-profile-validator";
 import {
   createOperationBlock,
   listOperationBlocks,
   resolveImportedOperationBlockName,
 } from "../../../services/operations/operation-blocks-repository";
+import { validateOperationProfileImport } from "../../../services/operations/operation-profile-validator";
 import {
   createOperationProfile,
   listOperationProfiles,
diff --git a/server/src/application/operations/use-cases/set-active-operation-profile.ts b/server/src/application/operations/use-cases/set-active-operation-profile.ts
index 2f3c9dd2..65471d5d 100644
--- a/server/src/application/operations/use-cases/set-active-operation-profile.ts
+++ b/server/src/application/operations/use-cases/set-active-operation-profile.ts
@@ -1,7 +1,7 @@
 import { HttpError } from "@core/middleware/error-handler";
 
-import { getOperationProfileById } from "../../../services/operations/operation-profiles-repository";
 import { setActiveOperationProfile } from "../../../services/operations/operation-profile-settings-repository";
+import { getOperationProfileById } from "../../../services/operations/operation-profiles-repository";
 
 export async function setActiveOperationProfileWithValidation(
   activeProfileId: string | null
diff --git a/server/src/application/world-info/use-cases/replace-world-info-bindings.ts b/server/src/application/world-info/use-cases/replace-world-info-bindings.ts
index ae34581a..d9cd84d1 100644
--- a/server/src/application/world-info/use-cases/replace-world-info-bindings.ts
+++ b/server/src/application/world-info/use-cases/replace-world-info-bindings.ts
@@ -4,6 +4,7 @@ import {
   getWorldInfoBooksByIds,
   replaceWorldInfoBindings,
 } from "../../../services/world-info/world-info-repositories";
+
 import type { worldInfoBindingRoles, worldInfoScopes } from "../../../services/world-info/world-info-types";
 
 export async function replaceWorldInfoBindingsWithValidation(params: {
diff --git a/server/src/core/middleware/error-handler.ts b/server/src/core/middleware/error-handler.ts
index e8bc863a..3f8979b6 100644
--- a/server/src/core/middleware/error-handler.ts
+++ b/server/src/core/middleware/error-handler.ts
@@ -2,6 +2,7 @@ import { type NextFunction, type Request, type Response } from "express";
 
 import { type ApiErrorBody } from "@core/http/response";
 import { type Logger } from "@core/types/common";
+
 import { getRequestContext } from "../request-context/request-context";
 
 export class HttpError extends Error {
diff --git a/server/src/core/middleware/request-lifecycle-logger.ts b/server/src/core/middleware/request-lifecycle-logger.ts
index 2b8fb373..263e8ab6 100644
--- a/server/src/core/middleware/request-lifecycle-logger.ts
+++ b/server/src/core/middleware/request-lifecycle-logger.ts
@@ -1,7 +1,8 @@
+import { structuredLogger } from "../logging/structured-logger";
+import { getRequestContext } from "../request-context/request-context";
+
 import type { RequestHandler } from "express";
 
-import { getRequestContext } from "../request-context/request-context";
-import { structuredLogger } from "../logging/structured-logger";
 
 export const requestLifecycleLogger: RequestHandler = (req, res, next) => {
   const startedAt = Date.now();
diff --git a/server/src/core/services/base-service.ts b/server/src/core/services/base-service.ts
index ecc23a92..f208930c 100644
--- a/server/src/core/services/base-service.ts
+++ b/server/src/core/services/base-service.ts
@@ -1,7 +1,7 @@
 import fs from "fs/promises";
+import { randomUUID as uuidv4 } from "node:crypto";
 import path from "path";
 
-import { randomUUID as uuidv4 } from "node:crypto";
 
 import { HttpError } from "@core/middleware/error-handler";
 import { type BaseEntity, type Logger, type ServiceOptions } from "@core/types/common";
diff --git a/server/src/routes/generate-routes.ts b/server/src/routes/generate-routes.ts
index 7eccbfc8..d59866b0 100644
--- a/server/src/routes/generate-routes.ts
+++ b/server/src/routes/generate-routes.ts
@@ -1,5 +1,6 @@
-import express, { type Request, type Response } from "express";
 import { randomUUID as uuidv4 } from "node:crypto";
+
+import express, { type Request, type Response } from "express";
 import { z } from "zod";
 
 import { asyncHandler } from "@core/middleware/async-handler";
diff --git a/server/src/services/chat-core/chats-repository.ts b/server/src/services/chat-core/chats-repository.ts
index 18a1dbc0..5a2b1276 100644
--- a/server/src/services/chat-core/chats-repository.ts
+++ b/server/src/services/chat-core/chats-repository.ts
@@ -1,6 +1,7 @@
-import { and, desc, eq, lt, ne } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, desc, eq, lt, ne } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { initDb } from "../../db/client";
 import {
diff --git a/server/src/services/chat-core/entity-profiles-repository.ts b/server/src/services/chat-core/entity-profiles-repository.ts
index b754ee9a..74d74dc7 100644
--- a/server/src/services/chat-core/entity-profiles-repository.ts
+++ b/server/src/services/chat-core/entity-profiles-repository.ts
@@ -1,6 +1,7 @@
-import { asc, eq } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { asc, eq } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { initDb } from "../../db/client";
 import { entityProfiles } from "../../db/schema";
diff --git a/server/src/services/chat-core/generation-control-service.integration.test.ts b/server/src/services/chat-core/generation-control-service.integration.test.ts
index f704a11b..93a16d37 100644
--- a/server/src/services/chat-core/generation-control-service.integration.test.ts
+++ b/server/src/services/chat-core/generation-control-service.integration.test.ts
@@ -2,9 +2,9 @@ import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
 
-import { afterEach, beforeEach, describe, expect, test } from "vitest";
 
 import { eq } from "drizzle-orm";
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
 
 import { applyMigrations } from "../../db/apply-migrations";
 import { initDb, resetDbForTests } from "../../db/client";
@@ -14,9 +14,10 @@ import {
   entityProfiles,
   generationRuntimeControl,
 } from "../../db/schema";
-import { createGeneration } from "./generations-repository";
+
 import { getGenerationControlByGenerationId, markGenerationAbortRequested } from "./generation-control-repository";
 import { GenerationControlService } from "./generation-control-service";
+import { createGeneration } from "./generations-repository";
 
 async function waitFor(
   predicate: () => boolean,
diff --git a/server/src/services/chat-core/generation-control-service.ts b/server/src/services/chat-core/generation-control-service.ts
index 55821ad4..3416d04e 100644
--- a/server/src/services/chat-core/generation-control-service.ts
+++ b/server/src/services/chat-core/generation-control-service.ts
@@ -1,8 +1,5 @@
-import {
-  abortRegisteredGeneration,
-  registerGenerationAbortController,
-  unregisterGenerationAbortController,
-} from "./generation-runtime";
+import { structuredLogger } from "../../core/logging/structured-logger";
+
 import {
   clearGenerationControlLease,
   getGenerationControlByGenerationId,
@@ -10,7 +7,11 @@ import {
   markGenerationAbortRequested,
   upsertGenerationControlLease,
 } from "./generation-control-repository";
-import { structuredLogger } from "../../core/logging/structured-logger";
+import {
+  abortRegisteredGeneration,
+  registerGenerationAbortController,
+  unregisterGenerationAbortController,
+} from "./generation-runtime";
 
 import type { RunResult } from "../chat-generation-v3/contracts";
 
diff --git a/server/src/services/chat-core/generations-repository.ts b/server/src/services/chat-core/generations-repository.ts
index fc1528ab..ff642d78 100644
--- a/server/src/services/chat-core/generations-repository.ts
+++ b/server/src/services/chat-core/generations-repository.ts
@@ -1,6 +1,7 @@
-import { and, desc, eq } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, desc, eq } from "drizzle-orm";
+
 import {
   safeJsonParse,
   safeJsonStringify,
diff --git a/server/src/services/chat-core/instruction-st-base.ts b/server/src/services/chat-core/instruction-st-base.ts
index a8e7c388..cddb1d0b 100644
--- a/server/src/services/chat-core/instruction-st-base.ts
+++ b/server/src/services/chat-core/instruction-st-base.ts
@@ -1,14 +1,15 @@
-import { renderLiquidTemplate } from "./prompt-template-renderer";
-import {
-  BUILT_IN_SILLY_TAVERN_PRESET,
-  BUILT_IN_SILLY_TAVERN_PRESET_FILE_NAME,
-} from "./built-in-sillytavern-preset";
 import {
   isSillyTavernPreset,
   getSillyTavernPresetValidationError,
   SILLY_TAVERN_PREFERRED_CHARACTER_ID,
 } from "@shared/utils/sillytavern-preset";
 
+import {
+  BUILT_IN_SILLY_TAVERN_PRESET,
+  BUILT_IN_SILLY_TAVERN_PRESET_FILE_NAME,
+} from "./built-in-sillytavern-preset";
+import { renderLiquidTemplate } from "./prompt-template-renderer";
+
 import type { InstructionRenderContext } from "./prompt-template-renderer";
 import type {
   StBaseConfig,
diff --git a/server/src/services/chat-core/instructions-repository.ts b/server/src/services/chat-core/instructions-repository.ts
index eaf69c00..df13275a 100644
--- a/server/src/services/chat-core/instructions-repository.ts
+++ b/server/src/services/chat-core/instructions-repository.ts
@@ -1,6 +1,7 @@
-import { and, desc, eq } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, desc, eq } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { initDb } from "../../db/client";
 import { chats, instructions } from "../../db/schema";
diff --git a/server/src/services/chat-core/user-persons-repository.ts b/server/src/services/chat-core/user-persons-repository.ts
index d9b7a1ed..4f8d4eaf 100644
--- a/server/src/services/chat-core/user-persons-repository.ts
+++ b/server/src/services/chat-core/user-persons-repository.ts
@@ -1,6 +1,7 @@
-import { asc, desc, eq } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { asc, desc, eq } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { initDb } from "../../db/client";
 import { userPersons, userPersonsSettings } from "../../db/schema";
diff --git a/server/src/services/chat-entry-parts/entries-repository.ts b/server/src/services/chat-entry-parts/entries-repository.ts
index cc386752..66ca441e 100644
--- a/server/src/services/chat-entry-parts/entries-repository.ts
+++ b/server/src/services/chat-entry-parts/entries-repository.ts
@@ -1,6 +1,7 @@
-import { and, desc, eq, inArray, lt, or } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, desc, eq, inArray, lt, or } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { type DbExecutor, initDb } from "../../db/client";
 import { chatEntries, entryVariants } from "../../db/schema";
diff --git a/server/src/services/chat-entry-parts/parts-repository.ts b/server/src/services/chat-entry-parts/parts-repository.ts
index 6646ec31..0da54d7d 100644
--- a/server/src/services/chat-entry-parts/parts-repository.ts
+++ b/server/src/services/chat-entry-parts/parts-repository.ts
@@ -1,6 +1,7 @@
-import { and, eq, inArray } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, eq, inArray } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { type DbExecutor, initDb } from "../../db/client";
 import { entryVariants, variantParts } from "../../db/schema";
diff --git a/server/src/services/chat-entry-parts/variants-repository.ts b/server/src/services/chat-entry-parts/variants-repository.ts
index ab0a2d65..8c614dad 100644
--- a/server/src/services/chat-entry-parts/variants-repository.ts
+++ b/server/src/services/chat-entry-parts/variants-repository.ts
@@ -1,6 +1,7 @@
-import { and, eq, inArray } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, eq, inArray } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { type DbExecutor, initDb } from "../../db/client";
 import { chatEntries, entryVariants } from "../../db/schema";
diff --git a/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts b/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
index 9b11cd50..47f742d5 100644
--- a/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
+++ b/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
@@ -1,18 +1,19 @@
-import { and, eq, inArray } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, eq, inArray } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../../chat-core/json";
 import { initDb } from "../../../db/client";
 import { operationProfileSessionArtifacts } from "../../../db/schema";
 
 import type { ArtifactValue } from "../contracts";
+import type { OperationActivationState } from "../operations/operation-activation-intervals";
 import type {
   ArtifactFormat,
   ArtifactSemantics,
   ArtifactWriteMode,
   OperationProfile,
 } from "@shared/types/operation-profiles";
-import type { OperationActivationState } from "../operations/operation-activation-intervals";
 
 
 const MAX_HISTORY_ITEMS = 20;
diff --git a/server/src/services/chat-generation-v3/operations/effect-handlers/turn-effects.ts b/server/src/services/chat-generation-v3/operations/effect-handlers/turn-effects.ts
index 651f7998..f81fa20a 100644
--- a/server/src/services/chat-generation-v3/operations/effect-handlers/turn-effects.ts
+++ b/server/src/services/chat-generation-v3/operations/effect-handlers/turn-effects.ts
@@ -1,8 +1,8 @@
+import { safeJsonStringify } from "../../../../chat-core/json";
 import {
   createPart,
   getPartWithVariantContextById,
 } from "../../../chat-entry-parts/parts-repository";
-import { safeJsonStringify } from "../../../../chat-core/json";
 
 import type { UserTurnTarget } from "../../contracts";
 
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
index e0f20d43..8cc498df 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
@@ -1,13 +1,13 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-import { executeOperationsPhase } from "./execute-operations-phase";
-
-import type { InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
 import {
   normalizeOperationArtifactConfig,
   type LegacyOperationOutput,
   type OperationInProfile,
 } from "@shared/types/operation-profiles";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+
+import { executeOperationsPhase } from "./execute-operations-phase";
+
+import type { InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
 
 
 const mocks = vi.hoisted(() => ({
diff --git a/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts b/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts
index 3a3e568a..21f8fe8c 100644
--- a/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts
+++ b/server/src/services/chat-generation-v3/operations/operations-flow.integration.test.ts
@@ -1,3 +1,8 @@
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationInProfile,
+} from "@shared/types/operation-profiles";
 import { describe, expect, test } from "vitest";
 
 
@@ -8,11 +13,6 @@ import { executeOperationsPhase } from "./execute-operations-phase";
 
 import type { InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
 import type { RunState } from "../contracts";
-import {
-  normalizeOperationArtifactConfig,
-  type LegacyOperationOutput,
-  type OperationInProfile,
-} from "@shared/types/operation-profiles";
 
 type TemplateOp = Extract<OperationInProfile, { kind: "template" }>;
 
diff --git a/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts b/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
index fb3afea0..14778e2e 100644
--- a/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
+++ b/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
@@ -1,6 +1,7 @@
 import { commitEffectsPhase } from "../operations/commit-effects-phase";
 import { executeOperationsPhase } from "../operations/execute-operations-phase";
 
+import type { EmitRunEvent, StreamEventsWhile } from "./run-event-stream";
 import type { RunArtifactStore } from "../artifacts/run-artifact-store";
 import type {
   OperationSkipDetails,
@@ -9,9 +10,7 @@ import type {
   RunPersistenceTarget,
   RunState,
   UserTurnTarget,
-} from "../contracts";
-import type { EmitRunEvent, StreamEventsWhile } from "./run-event-stream";
-import type { PromptDraftMessage } from "../contracts";
+ PromptDraftMessage } from "../contracts";
 import type {
   OperationHook,
   OperationInProfile,
diff --git a/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts b/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts
index 00731d2a..63895b2a 100644
--- a/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts
+++ b/server/src/services/chat-generation-v3/orchestration/run-state-helpers.ts
@@ -1,5 +1,3 @@
-import type { GenerateMessage } from "@shared/types/generate";
-
 import type {
   ArtifactValue,
   PromptDraftMessage,
@@ -8,6 +6,8 @@ import type {
   RunResult,
   RunState,
 } from "../contracts";
+import type { GenerateMessage } from "@shared/types/generate";
+
 
 export function clonePromptDraftMessages(messages: PromptDraftMessage[]): PromptDraftMessage[] {
   return messages.map((message) => ({ role: message.role, content: message.content }));
diff --git a/server/src/services/chat-generation-v3/persist/finalize-run.integration.test.ts b/server/src/services/chat-generation-v3/persist/finalize-run.integration.test.ts
index f3bc8bc0..5a59061a 100644
--- a/server/src/services/chat-generation-v3/persist/finalize-run.integration.test.ts
+++ b/server/src/services/chat-generation-v3/persist/finalize-run.integration.test.ts
@@ -1,8 +1,8 @@
 import path from "node:path";
 
+import { eq } from "drizzle-orm";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 
-import { eq } from "drizzle-orm";
 
 import { applyMigrations } from "../../../db/apply-migrations";
 import { initDb, resetDbForTests } from "../../../db/client";
diff --git a/server/src/services/chat-generation-v3/persist/finalize-run.ts b/server/src/services/chat-generation-v3/persist/finalize-run.ts
index dbb524cf..0c34b023 100644
--- a/server/src/services/chat-generation-v3/persist/finalize-run.ts
+++ b/server/src/services/chat-generation-v3/persist/finalize-run.ts
@@ -1,8 +1,8 @@
+import { withDbTransaction } from "../../../db/client";
 import {
   finishGeneration,
   updateGenerationRunReports,
 } from "../../chat-core/generations-repository";
-import { withDbTransaction } from "../../../db/client";
 
 import type { RunContext, RunResult } from "../contracts";
 
diff --git a/server/src/services/chat-generation-v3/run-chat-generation-v3.ts b/server/src/services/chat-generation-v3/run-chat-generation-v3.ts
index 66a46fb7..0ee1fe75 100644
--- a/server/src/services/chat-generation-v3/run-chat-generation-v3.ts
+++ b/server/src/services/chat-generation-v3/run-chat-generation-v3.ts
@@ -1,3 +1,5 @@
+import { structuredLogger } from "../../core/logging/structured-logger";
+
 import { ProfileSessionArtifactStore } from "./artifacts/profile-session-artifact-store";
 import { RunArtifactStore } from "./artifacts/run-artifact-store";
 import { defaultGenerationControlPort } from "./control/generation-control-port";
@@ -7,8 +9,8 @@ import {
   normalizeOperationActivationConfig,
   resolveOperationActivationState,
 } from "./operations/operation-activation-intervals";
-import { runOperationHookPhase } from "./orchestration/run-operation-hook-phase";
 import { RunEventStream } from "./orchestration/run-event-stream";
+import { runOperationHookPhase } from "./orchestration/run-operation-hook-phase";
 import {
   buildRunDebugStateSnapshot,
   buildRunResult,
@@ -20,6 +22,7 @@ import {
 } from "./orchestration/run-state-helpers";
 import { defaultGenerationPersistencePort } from "./persist/generation-persistence-port";
 import { resolveRunContext } from "./prepare/resolve-run-context";
+import { buildBasePrompt } from "./prompt/build-base-prompt";
 import {
   buildPromptDiagnosticsDebugJson,
   buildRedactedSnapshot,
@@ -28,14 +31,12 @@ import {
   normalizeLlmMessagesForDebug,
   sumContextTokensByMessages,
 } from "./prompt/generation-debug-payload";
-import { buildBasePrompt } from "./prompt/build-base-prompt";
 import {
   ChatRuntimeStateRepository,
   type ChatRuntimeStatePayload,
   type ChatRuntimeStateScope,
 } from "./runtime/chat-runtime-state-repository";
 import { loadOrBootstrapRuntimeState } from "./runtime/operation-runtime-state";
-import { structuredLogger } from "../../core/logging/structured-logger";
 
 import type { OperationSkipDetails, RunEvent, RunRequest, RunState } from "./contracts";
 import type { OperationInProfile } from "@shared/types/operation-profiles";
diff --git a/server/src/services/chat-generation-v3/runtime/chat-runtime-state-repository.test.ts b/server/src/services/chat-generation-v3/runtime/chat-runtime-state-repository.test.ts
index facdc7c9..5ab918d0 100644
--- a/server/src/services/chat-generation-v3/runtime/chat-runtime-state-repository.test.ts
+++ b/server/src/services/chat-generation-v3/runtime/chat-runtime-state-repository.test.ts
@@ -13,6 +13,7 @@ import {
   entityProfiles,
   operationProfiles,
 } from "../../../db/schema";
+
 import { ChatRuntimeStateRepository } from "./chat-runtime-state-repository";
 
 describe("chat-runtime-state-repository", () => {
diff --git a/server/src/services/chat-generation-v3/runtime/chat-runtime-state-repository.ts b/server/src/services/chat-generation-v3/runtime/chat-runtime-state-repository.ts
index f4dcc7ae..53d5ce44 100644
--- a/server/src/services/chat-generation-v3/runtime/chat-runtime-state-repository.ts
+++ b/server/src/services/chat-generation-v3/runtime/chat-runtime-state-repository.ts
@@ -1,6 +1,7 @@
-import { and, eq } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, eq } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../../chat-core/json";
 import { initDb } from "../../../db/client";
 import { chatRuntimeState } from "../../../db/schema";
diff --git a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
index d76fe11b..0b6e01d7 100644
--- a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
+++ b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
@@ -19,6 +19,7 @@ import {
 } from "./operation-runtime-state";
 
 import type { Entry, Part, Variant } from "@shared/types/chat-entry-parts";
+
 import {
   normalizeOperationArtifactConfig,
   type LegacyOperationOutput,
diff --git a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.ts b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.ts
index 17961b9e..5340d752 100644
--- a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.ts
+++ b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.ts
@@ -3,14 +3,15 @@ import { listEntriesWithActiveVariantsPage } from "../../chat-entry-parts/entrie
 import { getPromptProjection } from "../../chat-entry-parts/projection";
 import { serializePart } from "../../chat-entry-parts/prompt-serializers";
 import { resolveOperationActivationState } from "../operations/operation-activation-intervals";
+
 import {
   ChatRuntimeStateRepository,
   type ChatRuntimeStatePayload,
   type ChatRuntimeStateScope,
 } from "./chat-runtime-state-repository";
 
-import type { OperationInProfile } from "@shared/types/operation-profiles";
 import type { GenerateMessage } from "@shared/types/generate";
+import type { OperationInProfile } from "@shared/types/operation-profiles";
 
 type UserContextEvent = {
   contextTokens: number;
diff --git a/server/src/services/llm/llm-presets-repository.ts b/server/src/services/llm/llm-presets-repository.ts
index cb5ecf8e..7d90bc45 100644
--- a/server/src/services/llm/llm-presets-repository.ts
+++ b/server/src/services/llm/llm-presets-repository.ts
@@ -1,5 +1,6 @@
-import { and, desc, eq } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
+
+import { and, desc, eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { HttpError } from "@core/middleware/error-handler";
diff --git a/server/src/services/llm/llm-repository.ts b/server/src/services/llm/llm-repository.ts
index 25a175b3..3e3f1ca1 100644
--- a/server/src/services/llm/llm-repository.ts
+++ b/server/src/services/llm/llm-repository.ts
@@ -1,6 +1,7 @@
-import { and, eq } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, eq } from "drizzle-orm";
+
 import {
   decryptSecret,
   encryptSecret,
diff --git a/server/src/services/operations/operation-block-validator.test.ts b/server/src/services/operations/operation-block-validator.test.ts
index e562a18e..08a9118f 100644
--- a/server/src/services/operations/operation-block-validator.test.ts
+++ b/server/src/services/operations/operation-block-validator.test.ts
@@ -1,6 +1,6 @@
+import { buildOperationArtifactId } from "@shared/types/operation-profiles";
 import { describe, expect, test } from "vitest";
 
-import { buildOperationArtifactId } from "@shared/types/operation-profiles";
 
 import { validateOperationBlockUpsertInput } from "./operation-block-validator";
 
diff --git a/server/src/services/operations/operation-block-validator.ts b/server/src/services/operations/operation-block-validator.ts
index 42346c63..680cdcb8 100644
--- a/server/src/services/operations/operation-block-validator.ts
+++ b/server/src/services/operations/operation-block-validator.ts
@@ -1,12 +1,3 @@
-import { z } from "zod";
-
-import { HttpError } from "@core/middleware/error-handler";
-
-import { validateLiquidTemplate } from "../chat-core/prompt-template-renderer";
-
-import { compileLlmJsonSchemaSpec } from "./llm-json-schema-spec";
-import { llmOperationParamsSchema } from "./llm-operation-params";
-
 import {
   normalizeOperationArtifactConfig,
   type ArtifactExposure,
@@ -26,6 +17,15 @@ import {
   type OperationTrigger,
   type PromptTimeMessageRole,
 } from "@shared/types/operation-profiles";
+import { z } from "zod";
+
+import { HttpError } from "@core/middleware/error-handler";
+
+import { validateLiquidTemplate } from "../chat-core/prompt-template-renderer";
+
+import { compileLlmJsonSchemaSpec } from "./llm-json-schema-spec";
+import { llmOperationParamsSchema } from "./llm-operation-params";
+
 
 const uuidSchema = z.string().uuid();
 
diff --git a/server/src/services/operations/operation-blocks-repository.ts b/server/src/services/operations/operation-blocks-repository.ts
index 4e12ede2..7a710dc2 100644
--- a/server/src/services/operations/operation-blocks-repository.ts
+++ b/server/src/services/operations/operation-blocks-repository.ts
@@ -1,6 +1,7 @@
-import { and, asc, eq } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, asc, eq } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { initDb } from "../../db/client";
 import { operationBlocks } from "../../db/schema";
diff --git a/server/src/services/operations/operation-profile-resolver.test.ts b/server/src/services/operations/operation-profile-resolver.test.ts
index 4c4633ad..634db253 100644
--- a/server/src/services/operations/operation-profile-resolver.test.ts
+++ b/server/src/services/operations/operation-profile-resolver.test.ts
@@ -1,13 +1,13 @@
-import { describe, expect, test, vi } from "vitest";
-
-import { resolveCompiledOperationProfile } from "./operation-profile-resolver";
-
 import {
   normalizeOperationArtifactConfig,
   type LegacyOperationOutput,
   type OperationBlock,
   type OperationProfile,
 } from "@shared/types/operation-profiles";
+import { describe, expect, test, vi } from "vitest";
+
+import { resolveCompiledOperationProfile } from "./operation-profile-resolver";
+
 
 const blockById = new Map<string, OperationBlock>();
 
diff --git a/server/src/services/operations/operation-profile-resolver.ts b/server/src/services/operations/operation-profile-resolver.ts
index 0a4f8162..dc71d9c3 100644
--- a/server/src/services/operations/operation-profile-resolver.ts
+++ b/server/src/services/operations/operation-profile-resolver.ts
@@ -1,7 +1,9 @@
+import { buildOperationArtifactId } from "@shared/types/operation-profiles";
+
 import { HttpError } from "@core/middleware/error-handler";
 
-import { getOperationBlockById } from "./operation-blocks-repository";
 import { validateCompiledProfileArtifactWriters } from "./operation-block-validator";
+import { getOperationBlockById } from "./operation-blocks-repository";
 
 import type {
   OperationArtifactConfig,
@@ -10,7 +12,6 @@ import type {
   OperationProfile,
   OperationKind,
 } from "@shared/types/operation-profiles";
-import { buildOperationArtifactId } from "@shared/types/operation-profiles";
 
 const ORDER_BUCKET = 1_000_000;
 
diff --git a/server/src/services/operations/operation-profiles-repository.ts b/server/src/services/operations/operation-profiles-repository.ts
index 84f10670..c234f9e9 100644
--- a/server/src/services/operations/operation-profiles-repository.ts
+++ b/server/src/services/operations/operation-profiles-repository.ts
@@ -1,6 +1,7 @@
-import { and, asc, eq } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, asc, eq } from "drizzle-orm";
+
 import { HttpError } from "@core/middleware/error-handler";
 
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
diff --git a/server/src/services/operations/template-operations-runtime.test.ts b/server/src/services/operations/template-operations-runtime.test.ts
index 27cce2e3..9a5a75df 100644
--- a/server/src/services/operations/template-operations-runtime.test.ts
+++ b/server/src/services/operations/template-operations-runtime.test.ts
@@ -1,3 +1,9 @@
+import {
+  buildOperationArtifactId,
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationProfile,
+} from "@shared/types/operation-profiles";
 import { describe, expect, test } from "vitest";
 
 import {
@@ -5,12 +11,6 @@ import {
   applyTemplateOperationsToPromptDraft,
 } from "./template-operations-runtime";
 
-import {
-  buildOperationArtifactId,
-  normalizeOperationArtifactConfig,
-  type LegacyOperationOutput,
-  type OperationProfile,
-} from "@shared/types/operation-profiles";
 
 function toArtifact(opId: string, title: string, output: LegacyOperationOutput) {
   return normalizeOperationArtifactConfig({
diff --git a/server/src/services/rag.service.ts b/server/src/services/rag.service.ts
index 12ca2101..5fd022bb 100644
--- a/server/src/services/rag.service.ts
+++ b/server/src/services/rag.service.ts
@@ -1,6 +1,7 @@
+import { randomUUID as uuidv4 } from "node:crypto";
+
 import axios from "axios";
 import { and, desc, eq } from "drizzle-orm";
-import { randomUUID as uuidv4 } from "node:crypto";
 import { z } from "zod";
 
 import { HttpError } from "@core/middleware/error-handler";
diff --git a/server/src/services/rag/chroma-rag.service.test.ts b/server/src/services/rag/chroma-rag.service.test.ts
index 574f374c..a1842929 100644
--- a/server/src/services/rag/chroma-rag.service.test.ts
+++ b/server/src/services/rag/chroma-rag.service.test.ts
@@ -2,11 +2,11 @@ import { afterEach, describe, expect, test, vi } from "vitest";
 
 import { HttpError } from "../../core/middleware/error-handler";
 
+import { chromaClient } from "./chroma-client";
 import {
   bootstrapChroma,
   createChromaRagService,
 } from "./chroma-rag.service";
-import { chromaClient } from "./chroma-client";
 
 afterEach(() => {
   vi.restoreAllMocks();
diff --git a/server/src/services/rag/chroma-rag.service.ts b/server/src/services/rag/chroma-rag.service.ts
index 2b455faa..22bee5d6 100644
--- a/server/src/services/rag/chroma-rag.service.ts
+++ b/server/src/services/rag/chroma-rag.service.ts
@@ -1,11 +1,12 @@
 import { getChromaConfig } from "../../config/chroma-config";
 import { HttpError } from "../../core/middleware/error-handler";
+import { generateRagEmbedding } from "../rag.service";
+import { normalizeWorldInfoBookEntries } from "../world-info/world-info-normalizer";
 import {
   getBookDataEntries,
   listWorldInfoBooksForIndexing,
 } from "../world-info/world-info-repositories";
-import { normalizeWorldInfoBookEntries } from "../world-info/world-info-normalizer";
-import type { WorldInfoBookDto } from "../world-info/world-info-types";
+
 
 import {
   chromaClient,
@@ -15,7 +16,9 @@ import {
   type ChromaWhere,
 } from "./chroma-client";
 import { extractEmbeddings } from "./rag-embeddings-normalizer";
-import { generateRagEmbedding } from "../rag.service";
+
+import type { WorldInfoBookDto } from "../world-info/world-info-types";
+
 
 type ChromaMetadataValue = string | number | boolean | null;
 
diff --git a/server/src/services/ui-theme/ui-theme-repository.ts b/server/src/services/ui-theme/ui-theme-repository.ts
index d6221be0..8c88b341 100644
--- a/server/src/services/ui-theme/ui-theme-repository.ts
+++ b/server/src/services/ui-theme/ui-theme-repository.ts
@@ -1,3 +1,5 @@
+import { randomUUID as uuidv4 } from "node:crypto";
+
 import {
   BUILT_IN_UI_THEME_PRESETS,
   DEFAULT_UI_THEME_PAYLOAD,
@@ -11,7 +13,6 @@ import {
   type UiThemeSettings,
 } from "@shared/types/ui-theme";
 import { and, desc, eq, or } from "drizzle-orm";
-import { randomUUID as uuidv4 } from "node:crypto";
 
 import { HttpError } from "@core/middleware/error-handler";
 
diff --git a/server/src/services/world-info/world-info-repositories.ts b/server/src/services/world-info/world-info-repositories.ts
index 88d85dff..70423a62 100644
--- a/server/src/services/world-info/world-info-repositories.ts
+++ b/server/src/services/world-info/world-info-repositories.ts
@@ -1,6 +1,7 @@
-import { and, desc, eq, inArray, isNull, lt, sql } from "drizzle-orm";
 import { randomUUID as uuidv4 } from "node:crypto";
 
+import { and, desc, eq, inArray, isNull, lt, sql } from "drizzle-orm";
+
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { initDb } from "../../db/client";
 import {
diff --git a/web/src/api/chat-entry-parts.ts b/web/src/api/chat-entry-parts.ts
index 62ad2ea8..cfa22581 100644
--- a/web/src/api/chat-entry-parts.ts
+++ b/web/src/api/chat-entry-parts.ts
@@ -1,8 +1,8 @@
 import { BASE_URL } from '../const';
 
 import type { SseEnvelope } from './chat-core';
-import type { ChatOperationRuntimeStateDto } from '@shared/types/chat-runtime-state';
 import type { Variant, Entry } from '@shared/types/chat-entry-parts';
+import type { ChatOperationRuntimeStateDto } from '@shared/types/chat-runtime-state';
 
 type ApiEnvelope<T> = { data: T; error?: unknown };
 export type ApiHttpError = Error & { status?: number };
diff --git a/web/src/features/llm-provider/llm-preset-manager.tsx b/web/src/features/llm-provider/llm-preset-manager.tsx
index 12b3af36..c9629d38 100644
--- a/web/src/features/llm-provider/llm-preset-manager.tsx
+++ b/web/src/features/llm-provider/llm-preset-manager.tsx
@@ -2,10 +2,11 @@ import { useTranslation } from 'react-i18next';
 
 import { toaster } from '@ui/toaster';
 
+import { PresetControls } from '../sidebars/settings/preset-controls';
+
 import type { LlmPresetDto, LlmPresetSettingsDto } from '../../api/llm';
 import type { LlmPresetPayload } from '@shared/types/llm';
 
-import { PresetControls } from '../sidebars/settings/preset-controls';
 
 type Props = {
 	presets: LlmPresetDto[];
diff --git a/web/src/features/sidebars/instructions/instruction-editor.tsx b/web/src/features/sidebars/instructions/instruction-editor.tsx
index ba039ffe..b9a92c06 100644
--- a/web/src/features/sidebars/instructions/instruction-editor.tsx
+++ b/web/src/features/sidebars/instructions/instruction-editor.tsx
@@ -1,4 +1,5 @@
 import { Accordion, Alert, Button, Collapse, Group, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
+import { isValidSillyTavernPromptIdentifier } from '@shared/utils/sillytavern-preset';
 import { useUnit } from 'effector-react';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -15,7 +16,6 @@ import {
 	ST_SYSTEM_PROMPT_DEFAULTS,
 } from '@model/instructions/st-preset';
 import { LiquidDocsButton } from '@ui/liquid-template-docs';
-import { isValidSillyTavernPromptIdentifier } from '@shared/utils/sillytavern-preset';
 
 import { prerenderInstruction } from '../../../api/instructions';
 
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
index b97ad8ad..b25fd192 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
@@ -1,6 +1,3 @@
-import { v4 as uuidv4 } from 'uuid';
-
-import type { OperationProfileDto } from '../../../../api/chat-core';
 import {
 	buildOperationArtifactId,
 	makeDefaultOperationArtifactConfig,
@@ -13,6 +10,9 @@ import {
 	type OperationKind,
 	type OperationTemplateParams,
 } from '@shared/types/operation-profiles';
+import { v4 as uuidv4 } from 'uuid';
+
+import type { OperationProfileDto } from '../../../../api/chat-core';
 
 export type FormTemplateParams = Omit<OperationTemplateParams, 'strictVariables'> & {
 	strictVariables: boolean;
diff --git a/web/src/features/sidebars/settings/rag-settings-tab.tsx b/web/src/features/sidebars/settings/rag-settings-tab.tsx
index d7b4f2a7..4330415d 100644
--- a/web/src/features/sidebars/settings/rag-settings-tab.tsx
+++ b/web/src/features/sidebars/settings/rag-settings-tab.tsx
@@ -6,9 +6,10 @@ import { useTranslation } from 'react-i18next';
 import { ragProviderModel } from '@model/rag-provider';
 import { toaster } from '@ui/toaster';
 
+import { PresetControls } from './preset-controls';
+
 import type { RagPreset, RagProviderConfig, RagProviderId } from '@shared/types/rag';
 
-import { PresetControls } from './preset-controls';
 
 const toProviderTokenKey = (providerId: RagProviderId, tokenId: string | null): string => `${providerId}:${tokenId ?? 'none'}`;
 
diff --git a/web/src/features/sidebars/world-info/world-info-editor-modal.tsx b/web/src/features/sidebars/world-info/world-info-editor-modal.tsx
index 375f2d6c..b119af75 100644
--- a/web/src/features/sidebars/world-info/world-info-editor-modal.tsx
+++ b/web/src/features/sidebars/world-info/world-info-editor-modal.tsx
@@ -10,7 +10,6 @@ import { FormInput } from '@ui/form-components';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 import { toaster } from '@ui/toaster';
 
-import { WorldInfoEntryItem } from './world-info-entry-item';
 import {
 	DEFAULT_PAGE_SIZE,
 	PAGE_SIZE_OPTIONS,
@@ -24,6 +23,7 @@ import {
 	type BookDraft,
 	type EntryState,
 } from './world-info-editor-shared';
+import { WorldInfoEntryItem } from './world-info-entry-item';
 
 import type { WorldInfoBookDto } from '../../../api/world-info';
 
diff --git a/web/src/model/instructions/index.ts b/web/src/model/instructions/index.ts
index 3f00cd27..83b33321 100644
--- a/web/src/model/instructions/index.ts
+++ b/web/src/model/instructions/index.ts
@@ -10,6 +10,7 @@ import {
 } from '../../api/instructions';
 import i18n from '../../i18n';
 import { $currentChat, setChatInstructionRequested, setOpenedChat } from '../chat-core';
+
 import { createEmptyStBaseConfig } from './st-preset';
 
 import type { CreateInstructionDraft, InstructionDto } from '../../api/instructions';
diff --git a/web/src/model/instructions/st-preset.ts b/web/src/model/instructions/st-preset.ts
index 83bea914..f0faeea0 100644
--- a/web/src/model/instructions/st-preset.ts
+++ b/web/src/model/instructions/st-preset.ts
@@ -3,6 +3,7 @@ import {
 	getSillyTavernPresetValidationError,
 	SILLY_TAVERN_PREFERRED_CHARACTER_ID,
 } from '@shared/utils/sillytavern-preset';
+
 import type {
 	StBaseConfig,
 	StBasePrompt,

From ef7079f79b88f1c043a1709f960a9467a81116ae Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Fri, 13 Mar 2026 01:27:45 +0300
Subject: [PATCH 15/54] fix: lint errors

---
 AGENTS.md                                     | 12 ++++-----
 server/src/api/llm.api.ts                     |  5 +---
 server/src/api/operation-blocks.core.api.ts   |  4 ---
 server/src/api/operation-profiles.core.api.ts | 22 +---------------
 server/src/api/world-info.core.api.ts         |  5 ----
 .../chat-runtime/generation-session.ts        |  7 +++++-
 .../chat-entry-read-use-cases.test.ts         |  3 +--
 .../chat-generation-use-cases.test.ts         |  7 +++---
 .../core/request-context/request-context.ts   |  8 +++---
 .../profile-session-artifact-store.ts         |  2 --
 .../operations/execute-operations-phase.ts    | 12 ---------
 .../runtime/operation-runtime-state.test.ts   | 25 +++++++++----------
 .../operations/operation-block-validator.ts   |  2 --
 web/src/ui/liquid-template-docs.tsx           |  5 ++--
 14 files changed, 36 insertions(+), 83 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index bf71b109..77076141 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -156,10 +156,11 @@ This file is strict on purpose. Follow it literally.
 - Any contract change MUST be validated in both app layers and reflected in docs when externally visible.
 
 ## Docs Rules (`docs/**`)
-- Docs are code-adjacent and MUST match current behavior.
-- RU and EN docs must stay structurally aligned.
-- If API surface or shared contract behavior changes, regenerate API docs before docs checks.
-- Do not leave docs knowingly stale after changing visible behavior.
+- Docs are currently outside the default verification scope.
+- Touch docs only when the task explicitly requires docs work.
+- If docs are touched, RU and EN docs must stay structurally aligned.
+- If docs are touched and API surface or shared contract behavior changes, regenerate API docs before docs checks.
+- Do not leave docs knowingly stale when docs are part of the task.
 
 ## TDD And Mandatory Verification
 - TDD is mandatory: red -> green -> refactor.
@@ -173,8 +174,7 @@ This file is strict on purpose. Follow it literally.
   - `yarn typecheck:web`
   - `yarn lint:web`
   - `yarn build:web`
-  - `yarn docs:check`
-- If API routes or shared contract surface changed, run `yarn docs:generate:api` before `yarn docs:check`.
+- If docs are touched and API routes or shared contract surface changed, run `yarn docs:generate:api` before `yarn docs:check`.
 
 ## Worktree Startup Rule
 - If the current repo folder name starts with `TaleSpinner_` and is not exactly `TaleSpinner_v1`, treat it as a git worktree.
diff --git a/server/src/api/llm.api.ts b/server/src/api/llm.api.ts
index 0de2a560..9ccf77b2 100644
--- a/server/src/api/llm.api.ts
+++ b/server/src/api/llm.api.ts
@@ -15,15 +15,12 @@ import {
   deleteToken,
   getProviderConfig,
   getRuntime,
-  getRuntimeProviderState,
   listProviders,
   listTokens,
   upsertProviderConfig,
-  upsertRuntimeProviderState,
-  upsertRuntime,
   updateToken,
 } from "@services/llm/llm-repository";
-import { getModels , checkProviderConnection } from "@services/llm/llm-service";
+import { checkProviderConnection, getModels } from "@services/llm/llm-service";
 
 import { updateLlmRuntime } from "../application/llm/use-cases/update-llm-runtime";
 
diff --git a/server/src/api/operation-blocks.core.api.ts b/server/src/api/operation-blocks.core.api.ts
index 3647e89a..8cfc6394 100644
--- a/server/src/api/operation-blocks.core.api.ts
+++ b/server/src/api/operation-blocks.core.api.ts
@@ -9,16 +9,12 @@ import { deleteOperationBlockWithValidation } from "../application/operations/us
 import { importOperationBlocks } from "../application/operations/use-cases/import-operation-blocks";
 import { idSchema, jsonValueSchema, ownerIdSchema } from "../chat-core/schemas";
 import { getRequestOwnerId } from "../core/request-context/request-context";
-import { validateOperationBlockImport } from "../services/operations/operation-block-validator";
 import {
   createOperationBlock,
-  deleteOperationBlock,
   getOperationBlockById,
   listOperationBlocks,
-  resolveImportedOperationBlockName,
   updateOperationBlock,
 } from "../services/operations/operation-blocks-repository";
-import { listOperationProfiles } from "../services/operations/operation-profiles-repository";
 
 const router = express.Router();
 
diff --git a/server/src/api/operation-profiles.core.api.ts b/server/src/api/operation-profiles.core.api.ts
index b83cdf22..4eaffcab 100644
--- a/server/src/api/operation-profiles.core.api.ts
+++ b/server/src/api/operation-profiles.core.api.ts
@@ -10,17 +10,7 @@ import { importOperationProfiles } from "../application/operations/use-cases/imp
 import { setActiveOperationProfileWithValidation } from "../application/operations/use-cases/set-active-operation-profile";
 import { idSchema, jsonValueSchema, ownerIdSchema } from "../chat-core/schemas";
 import { getRequestOwnerId } from "../core/request-context/request-context";
-import {
-  createOperationBlock,
-  getOperationBlockById,
-  listOperationBlocks,
-  resolveImportedOperationBlockName,
-} from "../services/operations/operation-blocks-repository";
-import {
-  getOperationProfileSettings,
-  setActiveOperationProfile,
-} from "../services/operations/operation-profile-settings-repository";
-import { validateOperationProfileImport } from "../services/operations/operation-profile-validator";
+import { getOperationProfileSettings } from "../services/operations/operation-profile-settings-repository";
 import {
   createOperationProfile,
   deleteOperationProfile,
@@ -43,16 +33,6 @@ const updateBodySchema = z.object({
   patch: jsonValueSchema,
 });
 
-function resolveImportedProfileName(input: string, existingNames: string[]): string {
-  const base = input.trim() || "Imported profile";
-  if (!existingNames.includes(base)) return base;
-  for (let idx = 2; idx <= 9999; idx += 1) {
-    const candidate = `${base} (imported ${idx})`;
-    if (!existingNames.includes(candidate)) return candidate;
-  }
-  return `${base} (imported ${Date.now()})`;
-}
-
 router.get(
   "/operation-profiles",
   asyncHandler(async (req: Request) => {
diff --git a/server/src/api/world-info.core.api.ts b/server/src/api/world-info.core.api.ts
index 503a01b6..b88eea6e 100644
--- a/server/src/api/world-info.core.api.ts
+++ b/server/src/api/world-info.core.api.ts
@@ -10,8 +10,6 @@ import { replaceWorldInfoBindingsWithValidation } from "../application/world-inf
 import { resolveWorldInfoForChat } from "../application/world-info/use-cases/resolve-world-info-for-chat";
 import { idSchema, ownerIdSchema } from "../chat-core/schemas";
 import { getRequestOwnerId } from "../core/request-context/request-context";
-import { getChatById } from "../services/chat-core/chats-repository";
-import { listProjectedPromptMessages } from "../services/chat-entry-parts/prompt-history";
 import {
   convertWorldInfoImport,
   exportWorldInfoBookToStNative,
@@ -27,16 +25,13 @@ import {
   createWorldInfoBook,
   duplicateWorldInfoBook,
   getWorldInfoBookById,
-  getWorldInfoBooksByIds,
   getWorldInfoSettings,
   listWorldInfoBindings,
   listWorldInfoBooks,
   patchWorldInfoSettings,
-  replaceWorldInfoBindings,
   softDeleteWorldInfoBook,
   updateWorldInfoBook,
 } from "../services/world-info/world-info-repositories";
-import { resolveWorldInfoRuntimeForChat } from "../services/world-info/world-info-runtime";
 import { worldInfoBindingRoles, worldInfoScopes } from "../services/world-info/world-info-types";
 
 const router = express.Router();
diff --git a/server/src/application/chat-runtime/generation-session.ts b/server/src/application/chat-runtime/generation-session.ts
index fcaa75c3..8908ab05 100644
--- a/server/src/application/chat-runtime/generation-session.ts
+++ b/server/src/application/chat-runtime/generation-session.ts
@@ -13,6 +13,7 @@ async function* streamWithFinalization(params: {
 }): AsyncGenerator<RunEvent> {
   let generationId: string | null = null;
   let streamError: unknown;
+  let finalizationError: unknown;
 
   try {
     for await (const event of params.events) {
@@ -29,10 +30,14 @@ async function* streamWithFinalization(params: {
       await params.afterRun?.({ generationId });
     } catch (afterRunError) {
       if (!streamError) {
-        throw afterRunError;
+        finalizationError = afterRunError;
       }
     }
   }
+
+  if (finalizationError) {
+    throw finalizationError;
+  }
 }
 
 export function buildChatGenerationSession(
diff --git a/server/src/application/chat-runtime/use-cases/chat-entry-read-use-cases.test.ts b/server/src/application/chat-runtime/use-cases/chat-entry-read-use-cases.test.ts
index fe481d92..ff9cca5b 100644
--- a/server/src/application/chat-runtime/use-cases/chat-entry-read-use-cases.test.ts
+++ b/server/src/application/chat-runtime/use-cases/chat-entry-read-use-cases.test.ts
@@ -1,5 +1,6 @@
 import path from "node:path";
 
+import { eq } from "drizzle-orm";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 
 const mocks = vi.hoisted(() => ({
@@ -39,8 +40,6 @@ vi.mock("../../../services/chat-core/generations-repository", async () => {
   };
 });
 
-import { eq } from "drizzle-orm";
-
 import { applyMigrations } from "../../../db/apply-migrations";
 import { initDb, resetDbForTests } from "../../../db/client";
 import { chatBranches, chats, entityProfiles } from "../../../db/schema";
diff --git a/server/src/application/chat-runtime/use-cases/chat-generation-use-cases.test.ts b/server/src/application/chat-runtime/use-cases/chat-generation-use-cases.test.ts
index 86592009..718987f0 100644
--- a/server/src/application/chat-runtime/use-cases/chat-generation-use-cases.test.ts
+++ b/server/src/application/chat-runtime/use-cases/chat-generation-use-cases.test.ts
@@ -1,6 +1,7 @@
 import path from "node:path";
 
-import { beforeEach, afterEach, describe, expect, test, vi } from "vitest";
+import { eq } from "drizzle-orm";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 
 const mocks = vi.hoisted(() => ({
   buildInstructionRenderContext: vi.fn(),
@@ -31,13 +32,11 @@ vi.mock("../../../services/chat-core/generations-repository", async () => {
   };
 });
 
-import { eq } from "drizzle-orm";
-
 import { applyMigrations } from "../../../db/apply-migrations";
 import { resetDbForTests, initDb } from "../../../db/client";
 import { chatBranches, chatEntries, chats, entityProfiles, entryVariants, variantParts } from "../../../db/schema";
 import { createTempDataDir, removeTempDataDir } from "../../../e2e/helpers/tmp-dir";
-import { createEntryWithVariant, getEntryById } from "../../../services/chat-entry-parts/entries-repository";
+import { createEntryWithVariant } from "../../../services/chat-entry-parts/entries-repository";
 import * as partsRepository from "../../../services/chat-entry-parts/parts-repository";
 import { listEntryVariants } from "../../../services/chat-entry-parts/variants-repository";
 
diff --git a/server/src/core/request-context/request-context.ts b/server/src/core/request-context/request-context.ts
index 5e4bd2d4..c06c3ed2 100644
--- a/server/src/core/request-context/request-context.ts
+++ b/server/src/core/request-context/request-context.ts
@@ -19,11 +19,9 @@ export type RequestContext = {
   };
 };
 
-declare global {
-  namespace Express {
-    interface Request {
-      context?: RequestContext;
-    }
+declare module "express-serve-static-core" {
+  interface Request {
+    context?: RequestContext;
   }
 }
 
diff --git a/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts b/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
index 47f742d5..2ae7561d 100644
--- a/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
+++ b/server/src/services/chat-generation-v3/artifacts/profile-session-artifact-store.ts
@@ -15,8 +15,6 @@ import type {
   OperationProfile,
 } from "@shared/types/operation-profiles";
 
-
-const MAX_HISTORY_ITEMS = 20;
 const INTERNAL_OPERATION_ACTIVATION_TAG_PREFIX = "__sys_op_activation__:";
 
 function normalizeHistory(input: unknown, nextValue: unknown, maxItems: number): unknown[] {
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
index 579e9705..12168ba9 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
@@ -1,6 +1,5 @@
 import { runOrchestrator } from "@core/operation-orchestrator";
 
-
 import { renderLiquidTemplate } from "../../chat-core/prompt-template-renderer";
 import {
   compileArtifactExposureEffect,
@@ -56,17 +55,6 @@ function normalizeText(value: unknown): string {
   return typeof value === "string" ? value : String(value ?? "");
 }
 
-function normalizePromptTimeRole(value: unknown): PromptDraftMessage["role"] {
-  if (value === "assistant" || value === "user" || value === "system") return value;
-  if (value === "developer") return "system";
-  return "system";
-}
-
-function normalizeDepthFromEnd(value: unknown): number {
-  const n = typeof value === "number" && Number.isFinite(value) ? value : 0;
-  return Math.abs(Math.floor(n));
-}
-
 function clonePreview(state: PreviewState): PreviewState {
   return {
     messages: state.messages.map((m) => ({ ...m })),
diff --git a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
index 0b6e01d7..b349a871 100644
--- a/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
+++ b/server/src/services/chat-generation-v3/runtime/operation-runtime-state.test.ts
@@ -1,5 +1,17 @@
+import {
+  normalizeOperationArtifactConfig,
+  type LegacyOperationOutput,
+  type OperationInProfile,
+} from "@shared/types/operation-profiles";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 
+import {
+  buildRuntimeBootstrapFromBranchHistory,
+  replayOperationActivationByEvents,
+} from "./operation-runtime-state";
+
+import type { Entry, Part, Variant } from "@shared/types/chat-entry-parts";
+
 const mocks = vi.hoisted(() => ({
   getBranchCurrentTurn: vi.fn(),
   listEntriesWithActiveVariantsPage: vi.fn(),
@@ -13,19 +25,6 @@ vi.mock("../../chat-entry-parts/entries-repository", () => ({
   listEntriesWithActiveVariantsPage: mocks.listEntriesWithActiveVariantsPage,
 }));
 
-import {
-  buildRuntimeBootstrapFromBranchHistory,
-  replayOperationActivationByEvents,
-} from "./operation-runtime-state";
-
-import type { Entry, Part, Variant } from "@shared/types/chat-entry-parts";
-
-import {
-  normalizeOperationArtifactConfig,
-  type LegacyOperationOutput,
-  type OperationInProfile,
-} from "@shared/types/operation-profiles";
-
 function toTemplateArtifact(opId: string, output: LegacyOperationOutput) {
   return normalizeOperationArtifactConfig({
     opId,
diff --git a/server/src/services/operations/operation-block-validator.ts b/server/src/services/operations/operation-block-validator.ts
index 680cdcb8..06648353 100644
--- a/server/src/services/operations/operation-block-validator.ts
+++ b/server/src/services/operations/operation-block-validator.ts
@@ -3,7 +3,6 @@ import {
   type ArtifactExposure,
   type ArtifactFormat,
   type ArtifactPersistence,
-  type ArtifactSemantics,
   type ArtifactUsage,
   type ArtifactWriteMode,
   type OperationActivationConfig,
@@ -26,7 +25,6 @@ import { validateLiquidTemplate } from "../chat-core/prompt-template-renderer";
 import { compileLlmJsonSchemaSpec } from "./llm-json-schema-spec";
 import { llmOperationParamsSchema } from "./llm-operation-params";
 
-
 const uuidSchema = z.string().uuid();
 
 const operationHookSchema = z.enum(["before_main_llm", "after_main_llm"] satisfies OperationHook[]);
diff --git a/web/src/ui/liquid-template-docs.tsx b/web/src/ui/liquid-template-docs.tsx
index 0ade1a9c..29dd2b63 100644
--- a/web/src/ui/liquid-template-docs.tsx
+++ b/web/src/ui/liquid-template-docs.tsx
@@ -23,13 +23,14 @@ type LiquidDocsDialogProps = {
 export const LiquidDocsDialog: React.FC<LiquidDocsDialogProps> = ({ context, open, onOpenChange }) => {
 	const { t } = useTranslation();
 	const [search, setSearch] = useState('');
-	const model = LIQUID_DOCS_BY_CONTEXT[context];
-	if (!model) return null;
 
 	useEffect(() => {
 		if (!open) setSearch('');
 	}, [open]);
 
+	const model = LIQUID_DOCS_BY_CONTEXT[context];
+	if (!model) return null;
+
 	const normalizedQuery = search.trim().toLocaleLowerCase();
 	const filteredVariables =
 		normalizedQuery.length === 0

From 0a9fefcd3a202dd17c17207ae5286b009e6d5a1f Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Fri, 13 Mar 2026 22:06:37 +0300
Subject: [PATCH 16/54] fix: import-export

---
 server/src/api/_routes_.ts                    |   2 +
 server/src/api/bundles.core.api.ts            |  85 ++++
 .../services/bundles/bundle-archive.test.ts   |  56 +++
 server/src/services/bundles/bundle-archive.ts |  89 ++++
 .../services/bundles/bundle-contract.test.ts  |  82 ++++
 .../bundles/bundle-import-export.test.ts      | 194 +++++++++
 server/src/services/bundles/bundle-legacy.ts  | 204 +++++++++
 .../bundles/export-bundle-selection.ts        | 274 ++++++++++++
 .../services/bundles/import-bundle-file.ts    | 370 +++++++++++++++++
 .../chat-core/entity-profile-media.ts         |  50 +++
 shared/types/bundles.ts                       | 389 ++++++++++++++++++
 web/src/api/bundles.ts                        | 105 +++++
 .../features/sidebars/app-settings/index.tsx  |  39 +-
 .../sidebars/common/bundle-helpers.test.ts    | 128 ++++++
 .../sidebars/common/bundle-helpers.ts         | 133 ++++++
 .../features/sidebars/instructions/index.tsx  |   2 +
 .../instruction-bundle-actions.tsx            | 266 ++++++++++++
 .../sidebars/operation-profiles/index.tsx     |  89 +++-
 .../operation-profiles/ui/block-actions.tsx   |  25 +-
 .../operation-profiles/ui/profile-actions.tsx |  25 +-
 web/src/i18n/resources/en/instructions.ts     |  35 ++
 web/src/i18n/resources/ru/instructions.ts     |  35 ++
 22 files changed, 2614 insertions(+), 63 deletions(-)
 create mode 100644 server/src/api/bundles.core.api.ts
 create mode 100644 server/src/services/bundles/bundle-archive.test.ts
 create mode 100644 server/src/services/bundles/bundle-archive.ts
 create mode 100644 server/src/services/bundles/bundle-contract.test.ts
 create mode 100644 server/src/services/bundles/bundle-import-export.test.ts
 create mode 100644 server/src/services/bundles/bundle-legacy.ts
 create mode 100644 server/src/services/bundles/export-bundle-selection.ts
 create mode 100644 server/src/services/bundles/import-bundle-file.ts
 create mode 100644 server/src/services/chat-core/entity-profile-media.ts
 create mode 100644 shared/types/bundles.ts
 create mode 100644 web/src/api/bundles.ts
 create mode 100644 web/src/features/sidebars/common/bundle-helpers.test.ts
 create mode 100644 web/src/features/sidebars/common/bundle-helpers.ts
 create mode 100644 web/src/features/sidebars/instructions/instruction-bundle-actions.tsx

diff --git a/server/src/api/_routes_.ts b/server/src/api/_routes_.ts
index 74dbfb59..ab5b9a60 100644
--- a/server/src/api/_routes_.ts
+++ b/server/src/api/_routes_.ts
@@ -1,4 +1,5 @@
 import appSettingsRoutes from "./app-settings.api";
+import bundlesCoreRoutes from "./bundles.core.api";
 import chatEntriesRoutes from "./chat-entries.api";
 import chatCoreRoutes from "./chats.core.api";
 import entityProfilesCoreRoutes from "./entity-profiles.core.api";
@@ -22,6 +23,7 @@ import userPersonsCoreRoutes from "./user-persons.core.api";
 import worldInfoCoreRoutes from "./world-info.core.api";
 
 export const routes = [
+  bundlesCoreRoutes,
   entityProfilesCoreRoutes,
   entityProfilesImportRoutes,
   chatCoreRoutes,
diff --git a/server/src/api/bundles.core.api.ts b/server/src/api/bundles.core.api.ts
new file mode 100644
index 00000000..ac16a9fb
--- /dev/null
+++ b/server/src/api/bundles.core.api.ts
@@ -0,0 +1,85 @@
+import express, { type Request } from "express";
+import multer from "multer";
+import { z } from "zod";
+
+import { asyncHandler } from "@core/middleware/async-handler";
+import { HttpError } from "@core/middleware/error-handler";
+import { validate } from "@core/middleware/validate";
+
+import { ownerIdSchema } from "../chat-core/schemas";
+import { getRequestOwnerId } from "../core/request-context/request-context";
+import { exportBundleSelection } from "../services/bundles/export-bundle-selection";
+import { importBundleFile } from "../services/bundles/import-bundle-file";
+
+const router = express.Router();
+const upload = multer({ storage: multer.memoryStorage(), limits: { fileSize: 25 * 1024 * 1024 } });
+
+const resourceKindSchema = z.enum([
+  "instruction",
+  "operation_block",
+  "operation_profile",
+  "world_info_book",
+  "entity_profile",
+  "ui_theme_preset",
+]);
+
+const exportBodySchema = z
+  .object({
+    ownerId: ownerIdSchema.optional(),
+    source: z.object({
+      kind: resourceKindSchema,
+      id: z.string().min(1),
+    }),
+    selections: z
+      .array(
+        z.object({
+          kind: resourceKindSchema,
+          id: z.string().min(1),
+        })
+      )
+      .min(1),
+    format: z.enum(["json", "archive", "auto"]).optional().default("auto"),
+  })
+  .strict();
+
+router.post(
+  "/bundles/export",
+  validate({ body: exportBodySchema }),
+  asyncHandler(async (req: Request) => {
+    const body = exportBodySchema.parse(req.body);
+    const exported = await exportBundleSelection({
+      ownerId: getRequestOwnerId(req, body.ownerId),
+      source: body.source,
+      selections: body.selections,
+      format: body.format,
+    });
+
+    return {
+      data: exported.buffer,
+      headers: {
+        "Content-Type": exported.contentType,
+        "Content-Disposition": `attachment; filename="${exported.fileName}"`,
+      },
+      raw: true,
+    };
+  })
+);
+
+router.post(
+  "/bundles/import",
+  upload.single("file"),
+  asyncHandler(async (req: Request) => {
+    if (!req.file) {
+      throw new HttpError(400, "file is required", "VALIDATION_ERROR");
+    }
+    return {
+      data: await importBundleFile({
+        ownerId: getRequestOwnerId(req),
+        fileName: req.file.originalname,
+        buffer: req.file.buffer,
+      }),
+    };
+  })
+);
+
+export default router;
diff --git a/server/src/services/bundles/bundle-archive.test.ts b/server/src/services/bundles/bundle-archive.test.ts
new file mode 100644
index 00000000..5002930a
--- /dev/null
+++ b/server/src/services/bundles/bundle-archive.test.ts
@@ -0,0 +1,56 @@
+import {
+  createBundleResourceId,
+  type TaleSpinnerBundle,
+} from "@shared/types/bundles";
+import { describe, expect, test } from "vitest";
+
+import { decodeBundleArchive, encodeBundleArchive } from "./bundle-archive";
+
+describe("bundle archive", () => {
+  test("round-trips manifest and files through .tsbundle archive", async () => {
+    const resourceId = createBundleResourceId("entity_profile", "hero");
+    const manifest: TaleSpinnerBundle = {
+      type: "talespinner.bundle",
+      version: 1,
+      bundleId: "bundle-1",
+      createdAt: "2026-03-13T10:00:00.000Z",
+      container: "archive",
+      sourceResourceId: resourceId,
+      resources: [
+        {
+          resourceId,
+          kind: "entity_profile",
+          schemaVersion: 1,
+          role: "primary",
+          title: "Hero",
+          payload: {
+            name: "Hero",
+            kind: "CharSpec",
+            spec: { name: "Hero" },
+            isFavorite: false,
+            avatarFile: {
+              path: "files/hero/avatar.png",
+              fileName: "avatar.png",
+              mediaType: "image/png",
+            },
+          },
+        },
+      ],
+    };
+
+    const archive = await encodeBundleArchive({
+      manifest,
+      files: {
+        "files/hero/avatar.png": {
+          fileName: "avatar.png",
+          mediaType: "image/png",
+          data: Buffer.from([1, 2, 3, 4]),
+        },
+      },
+    });
+    const decoded = await decodeBundleArchive(archive);
+
+    expect(decoded.manifest).toEqual(manifest);
+    expect(decoded.files["files/hero/avatar.png"]?.data).toEqual(Buffer.from([1, 2, 3, 4]));
+  });
+});
diff --git a/server/src/services/bundles/bundle-archive.ts b/server/src/services/bundles/bundle-archive.ts
new file mode 100644
index 00000000..c13dce87
--- /dev/null
+++ b/server/src/services/bundles/bundle-archive.ts
@@ -0,0 +1,89 @@
+import { createHash } from "node:crypto";
+import { promisify } from "node:util";
+import { gunzip, gzip } from "node:zlib";
+
+import { parseTaleSpinnerBundle, type TaleSpinnerBundle } from "@shared/types/bundles";
+import { z } from "zod";
+
+const gzipAsync = promisify(gzip);
+const gunzipAsync = promisify(gunzip);
+
+const archiveFileSchema = z
+  .object({
+    fileName: z.string().min(1),
+    mediaType: z.string().min(1),
+    dataBase64: z.string().min(1),
+    sha256: z.string().min(1),
+  })
+  .strict();
+
+const archivePackageSchema = z
+  .object({
+    manifest: z.unknown(),
+    files: z.record(z.string(), archiveFileSchema),
+  })
+  .strict();
+
+export type BundleArchiveFile = {
+  fileName: string;
+  mediaType: string;
+  data: Buffer;
+};
+
+export async function encodeBundleArchive(input: {
+  manifest: TaleSpinnerBundle;
+  files: Record<string, BundleArchiveFile>;
+}): Promise<Buffer> {
+  const files = Object.fromEntries(
+    Object.entries(input.files).map(([archivePath, file]) => {
+      const sha256 = createHash("sha256").update(file.data).digest("hex");
+      return [
+        archivePath,
+        {
+          fileName: file.fileName,
+          mediaType: file.mediaType,
+          dataBase64: file.data.toString("base64"),
+          sha256,
+        },
+      ];
+    })
+  );
+
+  const payload = Buffer.from(
+    JSON.stringify({
+      manifest: input.manifest,
+      files,
+    }),
+    "utf8"
+  );
+  return gzipAsync(payload);
+}
+
+export async function decodeBundleArchive(buffer: Buffer): Promise<{
+  manifest: TaleSpinnerBundle;
+  files: Record<string, BundleArchiveFile>;
+}> {
+  const decodedText = (await gunzipAsync(buffer)).toString("utf8");
+  const parsed = archivePackageSchema.parse(JSON.parse(decodedText) as unknown);
+  const manifest = parseTaleSpinnerBundle(parsed.manifest);
+
+  const files = Object.fromEntries(
+    Object.entries(parsed.files).map(([archivePath, file]) => {
+      const data = Buffer.from(file.dataBase64, "base64");
+      const sha256 = createHash("sha256").update(data).digest("hex");
+      if (sha256 !== file.sha256) {
+        throw new Error(`Archive file checksum mismatch: ${archivePath}`);
+      }
+      return [
+        archivePath,
+        {
+          fileName: file.fileName,
+          mediaType: file.mediaType,
+          data,
+        },
+      ];
+    })
+  );
+
+  return { manifest, files };
+}
diff --git a/server/src/services/bundles/bundle-contract.test.ts b/server/src/services/bundles/bundle-contract.test.ts
new file mode 100644
index 00000000..11fe67b2
--- /dev/null
+++ b/server/src/services/bundles/bundle-contract.test.ts
@@ -0,0 +1,82 @@
+import {
+  createBundleResourceId,
+  parseTaleSpinnerBundle,
+  validateBundleResourceGraph,
+} from "@shared/types/bundles";
+import { describe, expect, test } from "vitest";
+
+describe("bundle contract", () => {
+  test("parses valid bundle manifest", () => {
+    const blockResourceId = createBundleResourceId("operation_block", "scene");
+    const profileResourceId = createBundleResourceId("operation_profile", "main");
+
+    const parsed = parseTaleSpinnerBundle({
+      type: "talespinner.bundle",
+      version: 1,
+      bundleId: "bundle-1",
+      createdAt: "2026-03-13T10:00:00.000Z",
+      container: "json",
+      sourceResourceId: profileResourceId,
+      resources: [
+        {
+          resourceId: blockResourceId,
+          kind: "operation_block",
+          schemaVersion: 1,
+          role: "dependency",
+          title: "Scene block",
+          payload: {
+            name: "Scene block",
+            enabled: true,
+            operations: [],
+          },
+        },
+        {
+          resourceId: profileResourceId,
+          kind: "operation_profile",
+          schemaVersion: 1,
+          role: "primary",
+          title: "Main profile",
+          payload: {
+            name: "Main profile",
+            enabled: true,
+            executionMode: "concurrent",
+            operationProfileSessionId: "2d9f1f5c-6f38-4f94-9caa-0ea4f36f2db8",
+            blockRefs: [{ resourceId: blockResourceId, enabled: true, order: 0 }],
+          },
+        },
+      ],
+    });
+
+    expect(parsed.type).toBe("talespinner.bundle");
+    expect(parsed.resources).toHaveLength(2);
+    expect(() => validateBundleResourceGraph(parsed)).not.toThrow();
+  });
+
+  test("rejects missing cross-resource references", () => {
+    const parsed = parseTaleSpinnerBundle({
+      type: "talespinner.bundle",
+      version: 1,
+      bundleId: "bundle-1",
+      createdAt: "2026-03-13T10:00:00.000Z",
+      container: "json",
+      resources: [
+        {
+          resourceId: createBundleResourceId("operation_profile", "main"),
+          kind: "operation_profile",
+          schemaVersion: 1,
+          role: "primary",
+          title: "Main profile",
+          payload: {
+            name: "Main profile",
+            enabled: true,
+            executionMode: "concurrent",
+            operationProfileSessionId: "2d9f1f5c-6f38-4f94-9caa-0ea4f36f2db8",
+            blockRefs: [{ resourceId: "block-local-db-id", enabled: true, order: 0 }],
+          },
+        },
+      ],
+    });
+
+    expect(() => validateBundleResourceGraph(parsed)).toThrow(/Unknown operation_block resourceId/i);
+  });
+});
diff --git a/server/src/services/bundles/bundle-import-export.test.ts b/server/src/services/bundles/bundle-import-export.test.ts
new file mode 100644
index 00000000..ed5a31b8
--- /dev/null
+++ b/server/src/services/bundles/bundle-import-export.test.ts
@@ -0,0 +1,194 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+
+import { applyMigrations } from "../../db/apply-migrations";
+import { initDb, resetDbForTests } from "../../db/client";
+import { ensureInstructionsSchema } from "../../db/ensure-instructions-schema";
+import { ensureOperationBlocksCutover } from "../../db/ensure-operation-blocks-cutover";
+import { createInstruction } from "../chat-core/instructions-repository";
+import { createOperationBlock, listOperationBlocks } from "../operations/operation-blocks-repository";
+import { createOperationProfile, getOperationProfileById } from "../operations/operation-profiles-repository";
+import { createUiThemePreset } from "../ui-theme/ui-theme-repository";
+
+import { exportBundleSelection } from "./export-bundle-selection";
+import { importBundleFile } from "./import-bundle-file";
+
+describe("bundle import/export", () => {
+  let tempDir = "";
+  let dbPath = "";
+
+  beforeEach(async () => {
+    resetDbForTests();
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "talespinner-bundles-"));
+    dbPath = path.join(tempDir, "db.sqlite");
+    await initDb({ dbPath });
+    await applyMigrations();
+    await ensureInstructionsSchema();
+    await ensureOperationBlocksCutover();
+  });
+
+  afterEach(async () => {
+    resetDbForTests();
+    if (tempDir) {
+      await fs.rm(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  test("exports and imports instruction + operation profile bundle with remapped block refs", async () => {
+    const instruction = await createInstruction({
+      name: "Main instruction",
+      kind: "basic",
+      templateText: "{{char.name}}",
+    });
+    const block = await createOperationBlock({
+      input: {
+        name: "Scene block",
+        enabled: true,
+        operations: [],
+      },
+    });
+    const profile = await createOperationProfile({
+      input: {
+        name: "Main profile",
+        enabled: true,
+        executionMode: "concurrent",
+        operationProfileSessionId: "2d9f1f5c-6f38-4f94-9caa-0ea4f36f2db8",
+        blockRefs: [{ blockId: block.blockId, enabled: true, order: 0 }],
+      },
+    });
+
+    const exported = await exportBundleSelection({
+      ownerId: "global",
+      source: { kind: "instruction", id: instruction.id },
+      selections: [
+        { kind: "instruction", id: instruction.id },
+        { kind: "operation_profile", id: profile.profileId },
+      ],
+      format: "json",
+    });
+
+    const imported = await importBundleFile({
+      ownerId: "global",
+      fileName: exported.fileName,
+      buffer: exported.buffer,
+    });
+
+    expect(imported.created.instructions).toHaveLength(1);
+    expect(imported.created.operationProfiles).toHaveLength(1);
+    expect(imported.sourceResourceId).toBeTruthy();
+    expect(imported.applied.instructionId).toBe(imported.created.instructions[0]!.id);
+    expect(imported.applied.operationProfileId).toBe(imported.created.operationProfiles[0]!.profileId);
+    expect(imported.skippedApply).toEqual([]);
+
+    const createdProfile = await getOperationProfileById(imported.created.operationProfiles[0]!.profileId);
+    const blocks = await listOperationBlocks({ ownerId: "global" });
+
+    expect(createdProfile?.blockRefs).toHaveLength(1);
+    expect(createdProfile?.blockRefs[0]?.blockId).not.toBe(block.blockId);
+    expect(blocks.some((item) => item.blockId === createdProfile?.blockRefs[0]?.blockId)).toBe(true);
+  });
+
+  test("imports legacy ui theme export via bundle import endpoint", async () => {
+    const created = await createUiThemePreset({
+      ownerId: "global",
+      name: "Night",
+      payload: {
+        lightTokens: {},
+        darkTokens: {},
+        typography: {
+          uiFontFamily: "UI",
+          chatFontFamily: "Chat",
+          uiBaseFontSize: "16px",
+          chatBaseFontSize: "16px",
+          radiusXs: "4px",
+          radiusSm: "6px",
+          radiusMd: "8px",
+          radiusLg: "10px",
+          radiusXl: "12px",
+        },
+        markdown: {
+          fontSize: "16px",
+          lineHeight: "1.5",
+          codeFontSize: "14px",
+          codePadding: "2px 4px",
+          quoteBorderWidth: "3px",
+        },
+        customCss: "",
+      },
+    });
+
+    const legacyPayload = JSON.stringify({
+      type: "talespinner.uiThemePreset",
+      version: 1,
+      preset: {
+        name: created.name,
+        description: created.description,
+        payload: created.payload,
+      },
+    });
+
+    const imported = await importBundleFile({
+      ownerId: "global",
+      fileName: "ui-theme-night.json",
+      buffer: Buffer.from(legacyPayload, "utf8"),
+    });
+
+    expect(imported.created.uiThemePresets).toHaveLength(1);
+    expect(imported.applied.uiThemePresetId).toBe(imported.created.uiThemePresets[0]!.presetId);
+    expect(imported.warnings).toContain("Imported legacy UI theme preset format.");
+  });
+
+  test("reports ambiguous auto-apply targets when bundle has multiple resources of same kind without source", async () => {
+    const bundlePayload = JSON.stringify({
+      type: "talespinner.bundle",
+      version: 1,
+      bundleId: "bundle-ambiguous",
+      createdAt: "2026-03-13T10:00:00.000Z",
+      container: "json",
+      resources: [
+        {
+          resourceId: "instruction:one",
+          kind: "instruction",
+          schemaVersion: 1,
+          role: "related",
+          title: "One",
+          payload: {
+            name: "One",
+            kind: "basic",
+            engine: "liquidjs",
+            templateText: "One",
+          },
+        },
+        {
+          resourceId: "instruction:two",
+          kind: "instruction",
+          schemaVersion: 1,
+          role: "related",
+          title: "Two",
+          payload: {
+            name: "Two",
+            kind: "basic",
+            engine: "liquidjs",
+            templateText: "Two",
+          },
+        },
+      ],
+    });
+
+    const imported = await importBundleFile({
+      ownerId: "global",
+      fileName: "ambiguous.json",
+      buffer: Buffer.from(bundlePayload, "utf8"),
+    });
+
+    expect(imported.applied.instructionId).toBeNull();
+    expect(imported.skippedApply).toContainEqual({
+      kind: "instruction",
+      reason: "ambiguous",
+      message: "Skipped auto-apply for instruction: ambiguous imported resources.",
+    });
+  });
+});
diff --git a/server/src/services/bundles/bundle-legacy.ts b/server/src/services/bundles/bundle-legacy.ts
new file mode 100644
index 00000000..ed474c27
--- /dev/null
+++ b/server/src/services/bundles/bundle-legacy.ts
@@ -0,0 +1,204 @@
+import {
+  TALESPINNER_BUNDLE_TYPE,
+  TALESPINNER_BUNDLE_VERSION,
+  createBundleResourceId,
+  parseTaleSpinnerBundle,
+  type TaleSpinnerBundle,
+} from "@shared/types/bundles";
+import { UI_THEME_EXPORT_TYPE, type UiThemeExportV1 } from "@shared/types/ui-theme";
+
+import type { InstructionMeta, StBaseConfig } from "@shared/types/instructions";
+import type { OperationProfileExport, OperationProfileLegacyExportV1 } from "@shared/types/operation-profiles";
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function isOperationProfileBundleV2(
+  input: OperationProfileExport | OperationProfileLegacyExportV1
+): input is OperationProfileExport {
+  return "type" in input && input.type === "operation_profile_bundle";
+}
+
+function convertLegacyInstruction(input: Record<string, unknown>): TaleSpinnerBundle | null {
+  if (input.type !== "talespinner.instruction" || !isRecord(input.instruction)) return null;
+  const kind = input.instruction.kind;
+  const resourceId = createBundleResourceId("instruction", String(input.instruction.name ?? "instruction"));
+
+  return parseTaleSpinnerBundle({
+    type: TALESPINNER_BUNDLE_TYPE,
+    version: TALESPINNER_BUNDLE_VERSION,
+    bundleId: `legacy-instruction:${resourceId}`,
+    createdAt: new Date().toISOString(),
+    container: "json",
+    sourceResourceId: resourceId,
+    resources: [
+      {
+        resourceId,
+        kind: "instruction",
+        schemaVersion: 1,
+        role: "primary",
+        title: String(input.instruction.name ?? "Instruction"),
+        payload:
+          kind === "st_base"
+            ? {
+                name: String(input.instruction.name ?? "Instruction"),
+                kind: "st_base",
+                engine: "liquidjs",
+                stBase: input.instruction.stBase as StBaseConfig,
+                meta: input.instruction.meta as InstructionMeta | undefined,
+              }
+            : {
+                name: String(input.instruction.name ?? "Instruction"),
+                kind: "basic",
+                engine: "liquidjs",
+                templateText: String(input.instruction.templateText ?? ""),
+                meta: input.instruction.meta as InstructionMeta | undefined,
+              },
+      },
+    ],
+  });
+}
+
+function toOperationBundleResources(input: OperationProfileExport | OperationProfileLegacyExportV1): TaleSpinnerBundle {
+  const normalizedProfile = isOperationProfileBundleV2(input)
+    ? input.profile
+    : input;
+  const profileResourceId = createBundleResourceId("operation_profile", normalizedProfile.name);
+  const hasBlocks = isOperationProfileBundleV2(input);
+
+  const blockResources = hasBlocks
+    ? input.blocks.map((block) => {
+        const resourceId = createBundleResourceId("operation_block", block.name);
+        return {
+          resourceId,
+          kind: "operation_block" as const,
+          schemaVersion: 1 as const,
+          role: "dependency" as const,
+          title: block.name,
+          payload: {
+            name: block.name,
+            description: block.description,
+            enabled: block.enabled,
+            operations: block.operations,
+            meta: block.meta,
+          },
+        };
+      })
+    : [
+        {
+          resourceId: createBundleResourceId("operation_block", `${normalizedProfile.name}-block`),
+          kind: "operation_block" as const,
+          schemaVersion: 1 as const,
+          role: "dependency" as const,
+          title: `${normalizedProfile.name} block`,
+          payload: {
+            name: `${normalizedProfile.name} block`,
+            description: normalizedProfile.description,
+            enabled: true,
+            operations: input.operations,
+            meta: normalizedProfile.meta,
+          },
+        },
+      ];
+
+  const blockIdMap = new Map<string, string>();
+  if (hasBlocks) {
+    input.blocks.forEach((block, index) => {
+      if (block.blockId) {
+        blockIdMap.set(block.blockId, blockResources[index]!.resourceId);
+      }
+    });
+  }
+
+  return parseTaleSpinnerBundle({
+    type: TALESPINNER_BUNDLE_TYPE,
+    version: TALESPINNER_BUNDLE_VERSION,
+    bundleId: `legacy-operation:${profileResourceId}`,
+    createdAt: new Date().toISOString(),
+    container: "json",
+    sourceResourceId: profileResourceId,
+    resources: [
+      ...blockResources,
+      {
+        resourceId: profileResourceId,
+        kind: "operation_profile",
+        schemaVersion: 1,
+        role: "primary",
+        title: normalizedProfile.name,
+        payload: {
+          name: normalizedProfile.name,
+          description: normalizedProfile.description,
+          enabled: normalizedProfile.enabled,
+          executionMode: normalizedProfile.executionMode,
+          operationProfileSessionId: normalizedProfile.operationProfileSessionId,
+          blockRefs: hasBlocks
+              ? input.profile.blockRefs.map((ref) => ({
+                  resourceId: blockIdMap.get(ref.blockId) ?? ref.blockId,
+                  enabled: ref.enabled,
+                  order: ref.order,
+                }))
+              : [{ resourceId: blockResources[0]!.resourceId, enabled: true, order: 0 }],
+          meta: normalizedProfile.meta,
+        },
+      },
+    ],
+  });
+}
+
+function convertLegacyUiTheme(input: UiThemeExportV1 | UiThemeExportV1[]): TaleSpinnerBundle {
+  const items = Array.isArray(input) ? input : [input];
+  const resources = items.map((item, index) => {
+    const resourceId = createBundleResourceId("ui_theme_preset", `${item.preset.name}-${index + 1}`);
+    return {
+      resourceId,
+      kind: "ui_theme_preset" as const,
+      schemaVersion: 1 as const,
+      role: index === 0 ? ("primary" as const) : ("related" as const),
+      title: item.preset.name,
+      payload: {
+        name: item.preset.name,
+        description: item.preset.description,
+        payload: item.preset.payload,
+      },
+    };
+  });
+
+  return parseTaleSpinnerBundle({
+    type: TALESPINNER_BUNDLE_TYPE,
+    version: TALESPINNER_BUNDLE_VERSION,
+    bundleId: `legacy-ui-theme:${resources[0]!.resourceId}`,
+    createdAt: new Date().toISOString(),
+    container: "json",
+    sourceResourceId: resources[0]!.resourceId,
+    resources,
+  });
+}
+
+export function normalizeLegacyBundleInput(input: unknown): TaleSpinnerBundle | null {
+  if (isRecord(input)) {
+    const instructionBundle = convertLegacyInstruction(input);
+    if (instructionBundle) return instructionBundle;
+
+    if (input.type === UI_THEME_EXPORT_TYPE) {
+      return convertLegacyUiTheme(input as unknown as UiThemeExportV1);
+    }
+
+    if (
+      input.type === "operation_profile_bundle" ||
+      ("name" in input &&
+        "enabled" in input &&
+        "executionMode" in input &&
+        "operationProfileSessionId" in input &&
+        ("operations" in input || "profile" in input))
+    ) {
+      return toOperationBundleResources(input as OperationProfileExport | OperationProfileLegacyExportV1);
+    }
+  }
+
+  if (Array.isArray(input) && input.every((item) => isRecord(item) && item.type === UI_THEME_EXPORT_TYPE)) {
+    return convertLegacyUiTheme(input as UiThemeExportV1[]);
+  }
+
+  return null;
+}
diff --git a/server/src/services/bundles/export-bundle-selection.ts b/server/src/services/bundles/export-bundle-selection.ts
new file mode 100644
index 00000000..0ee68835
--- /dev/null
+++ b/server/src/services/bundles/export-bundle-selection.ts
@@ -0,0 +1,274 @@
+import { randomUUID } from "node:crypto";
+
+import {
+  TALESPINNER_BUNDLE_ARCHIVE_EXTENSION,
+  TALESPINNER_BUNDLE_ARCHIVE_MEDIA_TYPE,
+  createBundleResourceId,
+  parseTaleSpinnerBundle,
+  type TaleSpinnerBundle,
+  type TaleSpinnerBundleResource,
+  type TaleSpinnerBundleResourceKind,
+} from "@shared/types/bundles";
+
+import { readEntityProfileAvatarFile } from "../chat-core/entity-profile-media";
+import { getEntityProfileById } from "../chat-core/entity-profiles-repository";
+import { getInstructionById } from "../chat-core/instructions-repository";
+import { getOperationBlockById } from "../operations/operation-blocks-repository";
+import { getOperationProfileById } from "../operations/operation-profiles-repository";
+import { getUiThemePresetById } from "../ui-theme/ui-theme-repository";
+import { getWorldInfoBookById } from "../world-info/world-info-repositories";
+
+import { encodeBundleArchive, type BundleArchiveFile } from "./bundle-archive";
+
+export type BundleSelectionHandle = { kind: TaleSpinnerBundleResourceKind; id: string };
+
+function safeFileBaseName(input: string): string {
+  const normalized = input.trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
+  return normalized || "bundle";
+}
+
+export async function exportBundleSelection(params: {
+  ownerId: string;
+  source: BundleSelectionHandle;
+  selections: BundleSelectionHandle[];
+  format?: "json" | "archive" | "auto";
+}): Promise<{
+  fileName: string;
+  contentType: string;
+  buffer: Buffer;
+  bundle: TaleSpinnerBundle;
+}> {
+  const resources: TaleSpinnerBundleResource[] = [];
+  const files: Record<string, BundleArchiveFile> = {};
+  const included = new Set<string>();
+  let sourceResourceId: string | undefined;
+
+  const include = async (handle: BundleSelectionHandle, role: TaleSpinnerBundleResource["role"]) => {
+    const key = `${handle.kind}:${handle.id}`;
+    if (included.has(key)) return;
+    included.add(key);
+
+    if (handle.kind === "instruction") {
+      const instruction = await getInstructionById(handle.id);
+      if (!instruction) throw new Error(`Instruction not found: ${handle.id}`);
+      const resourceId = createBundleResourceId("instruction", `${instruction.name}-${instruction.id}`);
+      resources.push({
+        resourceId,
+        kind: "instruction",
+        schemaVersion: 1,
+        role,
+        title: instruction.name,
+        payload:
+          instruction.kind === "st_base"
+            ? {
+                name: instruction.name,
+                kind: "st_base",
+                engine: instruction.engine,
+                stBase: instruction.stBase,
+                meta: instruction.meta ?? undefined,
+              }
+            : {
+                name: instruction.name,
+                kind: "basic",
+                engine: instruction.engine,
+                templateText: instruction.templateText,
+                meta: instruction.meta ?? undefined,
+              },
+      });
+      if (handle.kind === params.source.kind && handle.id === params.source.id) sourceResourceId = resourceId;
+      return;
+    }
+
+    if (handle.kind === "operation_block") {
+      const block = await getOperationBlockById(handle.id);
+      if (!block) throw new Error(`Operation block not found: ${handle.id}`);
+      const resourceId = createBundleResourceId("operation_block", `${block.name}-${block.blockId}`);
+      resources.push({
+        resourceId,
+        kind: "operation_block",
+        schemaVersion: 1,
+        role,
+        title: block.name,
+        payload: {
+          name: block.name,
+          description: block.description,
+          enabled: block.enabled,
+          operations: block.operations,
+          meta: block.meta ?? undefined,
+        },
+      });
+      if (handle.kind === params.source.kind && handle.id === params.source.id) sourceResourceId = resourceId;
+      return;
+    }
+
+    if (handle.kind === "operation_profile") {
+      const profile = await getOperationProfileById(handle.id);
+      if (!profile) throw new Error(`Operation profile not found: ${handle.id}`);
+
+      const enabledRefs = profile.blockRefs.filter((ref) => ref.enabled);
+      const exportedBlockResources: Array<{ blockId: string; resourceId: string }> = [];
+      for (const ref of enabledRefs) {
+        const block = await getOperationBlockById(ref.blockId);
+        if (!block || !block.enabled) continue;
+        const resourceId = createBundleResourceId("operation_block", `${block.name}-${block.blockId}`);
+        exportedBlockResources.push({ blockId: block.blockId, resourceId });
+        resources.push({
+          resourceId,
+          kind: "operation_block",
+          schemaVersion: 1,
+          role: "dependency",
+          title: block.name,
+          payload: {
+            name: block.name,
+            description: block.description,
+            enabled: block.enabled,
+            operations: block.operations,
+            meta: block.meta ?? undefined,
+          },
+        });
+      }
+
+      const resourceId = createBundleResourceId("operation_profile", `${profile.name}-${profile.profileId}`);
+      resources.push({
+        resourceId,
+        kind: "operation_profile",
+        schemaVersion: 1,
+        role,
+        title: profile.name,
+        payload: {
+          name: profile.name,
+          description: profile.description,
+          enabled: profile.enabled,
+          executionMode: profile.executionMode,
+          operationProfileSessionId: profile.operationProfileSessionId,
+          blockRefs: profile.blockRefs
+            .filter((ref) => ref.enabled)
+            .map((ref) => ({
+              resourceId: exportedBlockResources.find((item) => item.blockId === ref.blockId)?.resourceId ?? ref.blockId,
+              enabled: ref.enabled,
+              order: ref.order,
+            }))
+            .filter((ref) => exportedBlockResources.some((item) => item.resourceId === ref.resourceId)),
+          meta: profile.meta ?? undefined,
+        },
+      });
+      if (handle.kind === params.source.kind && handle.id === params.source.id) sourceResourceId = resourceId;
+      return;
+    }
+
+    if (handle.kind === "world_info_book") {
+      const book = await getWorldInfoBookById(handle.id);
+      if (!book) throw new Error(`World info book not found: ${handle.id}`);
+      const resourceId = createBundleResourceId("world_info_book", `${book.slug}-${book.id}`);
+      resources.push({
+        resourceId,
+        kind: "world_info_book",
+        schemaVersion: 1,
+        role,
+        title: book.name,
+        payload: {
+          name: book.name,
+          slug: book.slug,
+          description: book.description,
+          data: book.data,
+          extensions: book.extensions,
+          source: book.source,
+        },
+      });
+      if (handle.kind === params.source.kind && handle.id === params.source.id) sourceResourceId = resourceId;
+      return;
+    }
+
+    if (handle.kind === "entity_profile") {
+      const profile = await getEntityProfileById(handle.id);
+      if (!profile) throw new Error(`Entity profile not found: ${handle.id}`);
+      const resourceId = createBundleResourceId("entity_profile", `${profile.name}-${profile.id}`);
+      const avatar = await readEntityProfileAvatarFile(profile.avatarAssetId);
+      const avatarPath = avatar ? `files/${safeFileBaseName(profile.name)}/${avatar.fileName}` : undefined;
+      if (avatar && avatarPath) {
+        files[avatarPath] = avatar;
+      }
+      resources.push({
+        resourceId,
+        kind: "entity_profile",
+        schemaVersion: 1,
+        role,
+        title: profile.name,
+        payload: {
+          name: profile.name,
+          kind: "CharSpec",
+          spec: profile.spec,
+          meta: profile.meta ?? undefined,
+          isFavorite: profile.isFavorite,
+          ...(avatar && avatarPath
+            ? {
+                avatarFile: {
+                  path: avatarPath,
+                  fileName: avatar.fileName,
+                  mediaType: avatar.mediaType,
+                },
+              }
+            : {}),
+        },
+      });
+      if (handle.kind === params.source.kind && handle.id === params.source.id) sourceResourceId = resourceId;
+      return;
+    }
+
+    if (handle.kind === "ui_theme_preset") {
+      const preset = await getUiThemePresetById({ ownerId: params.ownerId, presetId: handle.id });
+      if (!preset) throw new Error(`UI theme preset not found: ${handle.id}`);
+      const resourceId = createBundleResourceId("ui_theme_preset", `${preset.name}-${preset.presetId}`);
+      resources.push({
+        resourceId,
+        kind: "ui_theme_preset",
+        schemaVersion: 1,
+        role,
+        title: preset.name,
+        payload: {
+          name: preset.name,
+          description: preset.description,
+          payload: preset.payload,
+        },
+      });
+      if (handle.kind === params.source.kind && handle.id === params.source.id) sourceResourceId = resourceId;
+    }
+  };
+
+  await include(params.source, "primary");
+  for (const selection of params.selections) {
+    const role = selection.kind === params.source.kind && selection.id === params.source.id ? "primary" : "related";
+    await include(selection, role);
+  }
+
+  const container =
+    params.format === "archive" || (params.format !== "json" && Object.keys(files).length > 0)
+      ? "archive"
+      : "json";
+  const bundle = parseTaleSpinnerBundle({
+    type: "talespinner.bundle",
+    version: 1,
+    bundleId: randomUUID(),
+    createdAt: new Date().toISOString(),
+    container,
+    sourceResourceId,
+    resources,
+  });
+
+  if (container === "archive") {
+    const buffer = await encodeBundleArchive({ manifest: bundle, files });
+    return {
+      fileName: `talespinner-bundle-${safeFileBaseName(params.source.kind)}${TALESPINNER_BUNDLE_ARCHIVE_EXTENSION}`,
+      contentType: TALESPINNER_BUNDLE_ARCHIVE_MEDIA_TYPE,
+      buffer,
+      bundle,
+    };
+  }
+
+  return {
+    fileName: `talespinner-bundle-${safeFileBaseName(params.source.kind)}.json`,
+    contentType: "application/json; charset=utf-8",
+    buffer: Buffer.from(JSON.stringify(bundle, null, 2), "utf8"),
+    bundle,
+  };
+}
diff --git a/server/src/services/bundles/import-bundle-file.ts b/server/src/services/bundles/import-bundle-file.ts
new file mode 100644
index 00000000..94b5e6c8
--- /dev/null
+++ b/server/src/services/bundles/import-bundle-file.ts
@@ -0,0 +1,370 @@
+import {
+  type EntityProfileBundleResource,
+  type InstructionBundleResource,
+  type OperationBlockBundleResource,
+  type OperationProfileBundleResource,
+  parseTaleSpinnerBundle,
+  type TaleSpinnerBundle,
+  type UiThemePresetBundleResource,
+  validateBundleResourceGraph,
+  type WorldInfoBookBundleResource,
+} from "@shared/types/bundles";
+import { type InstructionMeta, type StBaseConfig } from "@shared/types/instructions";
+import { UI_THEME_EXPORT_TYPE } from "@shared/types/ui-theme";
+
+import { saveEntityProfileAvatarPng } from "../chat-core/entity-profile-media";
+import { createEntityProfile } from "../chat-core/entity-profiles-repository";
+import { createInstruction, listInstructions } from "../chat-core/instructions-repository";
+import { createOperationBlock, listOperationBlocks, resolveImportedOperationBlockName } from "../operations/operation-blocks-repository";
+import { createOperationProfile, listOperationProfiles } from "../operations/operation-profiles-repository";
+import { createUiThemePreset, listUiThemePresets, resolveImportedPresetName } from "../ui-theme/ui-theme-repository";
+import { createWorldInfoBook } from "../world-info/world-info-repositories";
+
+import { decodeBundleArchive } from "./bundle-archive";
+import { normalizeLegacyBundleInput } from "./bundle-legacy";
+
+function resolveImportedName(input: string, existingNames: Set<string>, suffix = "copy"): string {
+  const base = input.trim() || "Imported item";
+  if (!existingNames.has(base)) {
+    existingNames.add(base);
+    return base;
+  }
+  let index = 2;
+  while (existingNames.has(`${base} (${suffix} ${index})`)) {
+    index += 1;
+  }
+  const next = `${base} (${suffix} ${index})`;
+  existingNames.add(next);
+  return next;
+}
+
+function looksLikeArchive(buffer: Buffer): boolean {
+  return buffer.length >= 2 && buffer[0] === 0x1f && buffer[1] === 0x8b;
+}
+
+function isInstructionResource(resource: TaleSpinnerBundle["resources"][number]): resource is InstructionBundleResource {
+  return resource.kind === "instruction";
+}
+
+function isOperationBlockResource(resource: TaleSpinnerBundle["resources"][number]): resource is OperationBlockBundleResource {
+  return resource.kind === "operation_block";
+}
+
+function isOperationProfileResource(resource: TaleSpinnerBundle["resources"][number]): resource is OperationProfileBundleResource {
+  return resource.kind === "operation_profile";
+}
+
+function isWorldInfoBookResource(resource: TaleSpinnerBundle["resources"][number]): resource is WorldInfoBookBundleResource {
+  return resource.kind === "world_info_book";
+}
+
+function isEntityProfileResource(resource: TaleSpinnerBundle["resources"][number]): resource is EntityProfileBundleResource {
+  return resource.kind === "entity_profile";
+}
+
+function isUiThemePresetResource(resource: TaleSpinnerBundle["resources"][number]): resource is UiThemePresetBundleResource {
+  return resource.kind === "ui_theme_preset";
+}
+
+type CreatedResourceItem = { resourceId: string };
+type AutoApplyKind =
+  | "instruction"
+  | "operation_profile"
+  | "ui_theme_preset"
+  | "entity_profile"
+  | "world_info_book";
+
+type BundleAppliedTargets = {
+  instructionId: string | null;
+  operationProfileId: string | null;
+  uiThemePresetId: string | null;
+  entityProfileId: string | null;
+  worldInfoBookId: string | null;
+};
+
+type BundleSkippedApplyItem = {
+  kind: AutoApplyKind;
+  reason: "ambiguous";
+  message: string;
+};
+
+function resolveAppliedTarget<T extends CreatedResourceItem, TResult>(
+  items: T[],
+  sourceResourceId: string | undefined,
+  kind: AutoApplyKind,
+  label: string,
+  pickId: (item: T) => TResult
+): { value: TResult | null; skipped: BundleSkippedApplyItem | null } {
+  if (items.length === 0) {
+    return { value: null, skipped: null };
+  }
+
+  if (sourceResourceId) {
+    const sourceMatch = items.find((item) => item.resourceId === sourceResourceId) ?? null;
+    if (sourceMatch) {
+      return { value: pickId(sourceMatch), skipped: null };
+    }
+  }
+
+  if (items.length === 1) {
+    return { value: pickId(items[0]!), skipped: null };
+  }
+
+  return {
+    value: null,
+    skipped: {
+      kind,
+      reason: "ambiguous",
+      message: `Skipped auto-apply for ${label}: ambiguous imported resources.`,
+    },
+  };
+}
+
+export async function importBundleFile(params: {
+  ownerId: string;
+  fileName: string;
+  buffer: Buffer;
+}): Promise<{
+  sourceResourceId?: string;
+  created: {
+    instructions: Array<{ resourceId: string; id: string; name: string }>;
+    operationBlocks: Array<{ resourceId: string; blockId: string; name: string }>;
+    operationProfiles: Array<{ resourceId: string; profileId: string; name: string }>;
+    worldInfoBooks: Array<{ resourceId: string; id: string; name: string }>;
+    entityProfiles: Array<{ resourceId: string; id: string; name: string }>;
+    uiThemePresets: Array<{ resourceId: string; presetId: string; name: string }>;
+  };
+  applied: BundleAppliedTargets;
+  skippedApply: BundleSkippedApplyItem[];
+  warnings: string[];
+}> {
+  const files: Record<string, { data: Buffer; mediaType: string; fileName: string }> = {};
+  let bundle: TaleSpinnerBundle;
+
+  if (looksLikeArchive(params.buffer)) {
+    const decoded = await decodeBundleArchive(params.buffer);
+    bundle = decoded.manifest;
+    Object.assign(files, decoded.files);
+  } else {
+    const text = params.buffer.toString("utf8");
+    const raw = JSON.parse(text) as unknown;
+    const legacy = normalizeLegacyBundleInput(raw);
+    bundle = legacy ?? parseTaleSpinnerBundle(raw);
+  }
+
+  validateBundleResourceGraph(bundle);
+
+  const [existingInstructions, existingBlocks, existingProfiles, existingThemes] = await Promise.all([
+    listInstructions({ ownerId: params.ownerId }),
+    listOperationBlocks({ ownerId: params.ownerId }),
+    listOperationProfiles({ ownerId: params.ownerId }),
+    listUiThemePresets({ ownerId: params.ownerId }),
+  ]);
+
+  const instructionNames = new Set(existingInstructions.map((item) => item.name));
+  const blockNames = new Set(existingBlocks.map((item) => item.name));
+  const profileNames = new Set(existingProfiles.map((item) => item.name));
+  const themeNames = new Set(existingThemes.map((item) => item.name));
+  const blockIdMap = new Map<string, string>();
+
+  const created = {
+    instructions: [] as Array<{ resourceId: string; id: string; name: string }>,
+    operationBlocks: [] as Array<{ resourceId: string; blockId: string; name: string }>,
+    operationProfiles: [] as Array<{ resourceId: string; profileId: string; name: string }>,
+    worldInfoBooks: [] as Array<{ resourceId: string; id: string; name: string }>,
+    entityProfiles: [] as Array<{ resourceId: string; id: string; name: string }>,
+    uiThemePresets: [] as Array<{ resourceId: string; presetId: string; name: string }>,
+  };
+  const warnings: string[] = [];
+
+  for (const resource of bundle.resources.filter(isInstructionResource)) {
+    const name = resolveImportedName(resource.payload.name, instructionNames, "copy");
+    const createdInstruction =
+      resource.payload.kind === "st_base"
+        ? await createInstruction({
+            ownerId: params.ownerId,
+            name,
+            kind: "st_base",
+            stBase: resource.payload.stBase as StBaseConfig,
+            meta: resource.payload.meta as InstructionMeta | undefined,
+          })
+        : await createInstruction({
+            ownerId: params.ownerId,
+            name,
+            kind: "basic",
+            templateText: resource.payload.templateText ?? "",
+            meta: resource.payload.meta as InstructionMeta | undefined,
+          });
+    created.instructions.push({
+      resourceId: resource.resourceId,
+      id: createdInstruction.id,
+      name: createdInstruction.name,
+    });
+  }
+
+  for (const resource of bundle.resources.filter(isOperationBlockResource)) {
+    const name = resolveImportedOperationBlockName(resource.payload.name, Array.from(blockNames));
+    blockNames.add(name);
+    const block = await createOperationBlock({
+      ownerId: params.ownerId,
+      input: {
+        name,
+        description: resource.payload.description,
+        enabled: resource.payload.enabled,
+        operations: resource.payload.operations,
+        meta: resource.payload.meta,
+      },
+    });
+    blockIdMap.set(resource.resourceId, block.blockId);
+    created.operationBlocks.push({
+      resourceId: resource.resourceId,
+      blockId: block.blockId,
+      name: block.name,
+    });
+  }
+
+  for (const resource of bundle.resources.filter(isOperationProfileResource)) {
+    const name = resolveImportedName(resource.payload.name, profileNames, "imported");
+    const profile = await createOperationProfile({
+      ownerId: params.ownerId,
+      input: {
+        name,
+        description: resource.payload.description,
+        enabled: resource.payload.enabled,
+        executionMode: resource.payload.executionMode,
+        operationProfileSessionId: resource.payload.operationProfileSessionId,
+        blockRefs: resource.payload.blockRefs.map((ref) => ({
+          blockId: blockIdMap.get(ref.resourceId) ?? ref.resourceId,
+          enabled: ref.enabled,
+          order: ref.order,
+        })),
+        meta: resource.payload.meta,
+      },
+    });
+    created.operationProfiles.push({
+      resourceId: resource.resourceId,
+      profileId: profile.profileId,
+      name: profile.name,
+    });
+  }
+
+  for (const resource of bundle.resources.filter(isWorldInfoBookResource)) {
+    const book = await createWorldInfoBook({
+      ownerId: params.ownerId,
+      name: resource.payload.name,
+      slug: resource.payload.slug,
+      description: resource.payload.description ?? null,
+      data: resource.payload.data,
+      extensions: resource.payload.extensions,
+      source: resource.payload.source,
+    });
+    created.worldInfoBooks.push({
+      resourceId: resource.resourceId,
+      id: book.id,
+      name: book.name,
+    });
+  }
+
+  for (const resource of bundle.resources.filter(isEntityProfileResource)) {
+    let avatarAssetId: string | undefined;
+    if (resource.payload.avatarFile) {
+      const file = files[resource.payload.avatarFile.path];
+      if (file) {
+        avatarAssetId = await saveEntityProfileAvatarPng(file.data);
+      } else {
+        warnings.push(`Missing archive file: ${resource.payload.avatarFile.path}`);
+      }
+    }
+    const profile = await createEntityProfile({
+      ownerId: params.ownerId,
+      name: resource.payload.name,
+      kind: "CharSpec",
+      spec: resource.payload.spec,
+      meta: resource.payload.meta,
+      isFavorite: resource.payload.isFavorite,
+      avatarAssetId,
+    });
+    created.entityProfiles.push({
+      resourceId: resource.resourceId,
+      id: profile.id,
+      name: profile.name,
+    });
+  }
+
+  for (const resource of bundle.resources.filter(isUiThemePresetResource)) {
+    const name = resolveImportedPresetName(resource.payload.name, Array.from(themeNames));
+    themeNames.add(name);
+    const preset = await createUiThemePreset({
+      ownerId: params.ownerId,
+      name,
+      description: resource.payload.description,
+      payload: resource.payload.payload,
+    });
+    created.uiThemePresets.push({
+      resourceId: resource.resourceId,
+      presetId: preset.presetId,
+      name: preset.name,
+    });
+  }
+
+  if (params.fileName.endsWith(".json") && params.buffer.toString("utf8").includes(UI_THEME_EXPORT_TYPE)) {
+    warnings.push("Imported legacy UI theme preset format.");
+  }
+
+  const instructionApply = resolveAppliedTarget(
+    created.instructions,
+    bundle.sourceResourceId,
+    "instruction",
+    "instruction",
+    (item) => item.id
+  );
+  const operationProfileApply = resolveAppliedTarget(
+    created.operationProfiles,
+    bundle.sourceResourceId,
+    "operation_profile",
+    "operation profile",
+    (item) => item.profileId
+  );
+  const uiThemePresetApply = resolveAppliedTarget(
+    created.uiThemePresets,
+    bundle.sourceResourceId,
+    "ui_theme_preset",
+    "UI theme preset",
+    (item) => item.presetId
+  );
+  const entityProfileApply = resolveAppliedTarget(
+    created.entityProfiles,
+    bundle.sourceResourceId,
+    "entity_profile",
+    "entity profile",
+    (item) => item.id
+  );
+  const worldInfoBookApply = resolveAppliedTarget(
+    created.worldInfoBooks,
+    bundle.sourceResourceId,
+    "world_info_book",
+    "world info book",
+    (item) => item.id
+  );
+  const skippedApply = [
+    instructionApply.skipped,
+    operationProfileApply.skipped,
+    uiThemePresetApply.skipped,
+    entityProfileApply.skipped,
+    worldInfoBookApply.skipped,
+  ].filter((item): item is BundleSkippedApplyItem => Boolean(item));
+
+  return {
+    sourceResourceId: bundle.sourceResourceId,
+    created,
+    applied: {
+      instructionId: instructionApply.value,
+      operationProfileId: operationProfileApply.value,
+      uiThemePresetId: uiThemePresetApply.value,
+      entityProfileId: entityProfileApply.value,
+      worldInfoBookId: worldInfoBookApply.value,
+    },
+    skippedApply,
+    warnings,
+  };
+}
diff --git a/server/src/services/chat-core/entity-profile-media.ts b/server/src/services/chat-core/entity-profile-media.ts
new file mode 100644
index 00000000..32099691
--- /dev/null
+++ b/server/src/services/chat-core/entity-profile-media.ts
@@ -0,0 +1,50 @@
+import { randomUUID } from "node:crypto";
+import fs from "node:fs/promises";
+import path from "node:path";
+
+import { createDataPath } from "../../utils";
+
+const PNG_SIGNATURE = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+
+function getEntityProfileImagesDir(): string {
+  return createDataPath("media", "images", "entity-profiles");
+}
+
+export function resolveEntityProfileMediaPath(avatarAssetId: string | null): string | null {
+  if (!avatarAssetId || !avatarAssetId.startsWith("/media/")) return null;
+  return createDataPath(avatarAssetId.replace(/^\/media\//, "media/"));
+}
+
+export async function readEntityProfileAvatarFile(avatarAssetId: string | null): Promise<{
+  data: Buffer;
+  fileName: string;
+  mediaType: "image/png";
+} | null> {
+  const filePath = resolveEntityProfileMediaPath(avatarAssetId);
+  if (!filePath) return null;
+
+  try {
+    const data = await fs.readFile(filePath);
+    if (!data.subarray(0, 8).equals(PNG_SIGNATURE)) return null;
+    return {
+      data,
+      fileName: path.basename(filePath),
+      mediaType: "image/png",
+    };
+  } catch {
+    return null;
+  }
+}
+
+export async function saveEntityProfileAvatarPng(fileBuffer: Buffer): Promise<string> {
+  if (!fileBuffer.subarray(0, 8).equals(PNG_SIGNATURE)) {
+    throw new Error("Entity profile avatar must be a PNG image.");
+  }
+
+  const dir = getEntityProfileImagesDir();
+  await fs.mkdir(dir, { recursive: true });
+
+  const fileName = `${randomUUID()}.png`;
+  await fs.writeFile(path.join(dir, fileName), fileBuffer);
+  return `/media/images/entity-profiles/${fileName}`;
+}
diff --git a/shared/types/bundles.ts b/shared/types/bundles.ts
new file mode 100644
index 00000000..ad057b5d
--- /dev/null
+++ b/shared/types/bundles.ts
@@ -0,0 +1,389 @@
+import type { InstructionMeta, StBaseConfig } from "./instructions";
+import type { OperationExecutionMode, OperationInProfile } from "./operation-profiles";
+import type { UiThemePresetPayload } from "./ui-theme";
+
+export const TALESPINNER_BUNDLE_TYPE = "talespinner.bundle";
+export const TALESPINNER_BUNDLE_VERSION = 1 as const;
+export const TALESPINNER_BUNDLE_ARCHIVE_MEDIA_TYPE = "application/x-talespinner-bundle";
+export const TALESPINNER_BUNDLE_ARCHIVE_EXTENSION = ".tsbundle";
+
+export type TaleSpinnerBundleContainer = "json" | "archive";
+export type TaleSpinnerBundleResourceRole = "primary" | "related" | "dependency";
+export type TaleSpinnerBundleResourceKind =
+  | "instruction"
+  | "operation_block"
+  | "operation_profile"
+  | "world_info_book"
+  | "entity_profile"
+  | "ui_theme_preset";
+
+export type BundleFileDescriptor = {
+  path: string;
+  fileName: string;
+  mediaType: string;
+  size?: number;
+  sha256?: string;
+};
+
+export type InstructionBundlePayload =
+  | {
+      name: string;
+      kind: "basic";
+      engine: "liquidjs";
+      templateText: string;
+      meta?: InstructionMeta;
+    }
+  | {
+      name: string;
+      kind: "st_base";
+      engine: "liquidjs";
+      stBase: StBaseConfig;
+      meta?: InstructionMeta;
+    };
+
+export type OperationBlockBundlePayload = {
+  name: string;
+  description?: string;
+  enabled: boolean;
+  operations: OperationInProfile[];
+  meta?: unknown;
+};
+
+export type OperationProfileBundlePayload = {
+  name: string;
+  description?: string;
+  enabled: boolean;
+  executionMode: OperationExecutionMode;
+  operationProfileSessionId: string;
+  blockRefs: Array<{
+    resourceId: string;
+    enabled: boolean;
+    order: number;
+  }>;
+  meta?: unknown;
+};
+
+export type WorldInfoBookBundlePayload = {
+  name: string;
+  slug?: string;
+  description?: string | null;
+  data: unknown;
+  extensions?: unknown | null;
+  source?: "native" | "imported" | "converted";
+};
+
+export type EntityProfileBundlePayload = {
+  name: string;
+  kind: "CharSpec";
+  spec: unknown;
+  meta?: unknown;
+  isFavorite: boolean;
+  avatarFile?: BundleFileDescriptor;
+};
+
+export type UiThemePresetBundlePayload = {
+  name: string;
+  description?: string;
+  payload: UiThemePresetPayload;
+};
+
+type BundleResourceBase<TKind extends TaleSpinnerBundleResourceKind, TPayload> = {
+  resourceId: string;
+  kind: TKind;
+  schemaVersion: 1;
+  role: TaleSpinnerBundleResourceRole;
+  title: string;
+  payload: TPayload;
+};
+
+export type InstructionBundleResource = BundleResourceBase<"instruction", InstructionBundlePayload>;
+export type OperationBlockBundleResource = BundleResourceBase<"operation_block", OperationBlockBundlePayload>;
+export type OperationProfileBundleResource = BundleResourceBase<"operation_profile", OperationProfileBundlePayload>;
+export type WorldInfoBookBundleResource = BundleResourceBase<"world_info_book", WorldInfoBookBundlePayload>;
+export type EntityProfileBundleResource = BundleResourceBase<"entity_profile", EntityProfileBundlePayload>;
+export type UiThemePresetBundleResource = BundleResourceBase<"ui_theme_preset", UiThemePresetBundlePayload>;
+
+export type TaleSpinnerBundleResource =
+  | InstructionBundleResource
+  | OperationBlockBundleResource
+  | OperationProfileBundleResource
+  | WorldInfoBookBundleResource
+  | EntityProfileBundleResource
+  | UiThemePresetBundleResource;
+
+export type TaleSpinnerBundle = {
+  type: typeof TALESPINNER_BUNDLE_TYPE;
+  version: typeof TALESPINNER_BUNDLE_VERSION;
+  bundleId: string;
+  createdAt: string;
+  sourceResourceId?: string;
+  container: TaleSpinnerBundleContainer;
+  resources: TaleSpinnerBundleResource[];
+};
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function assert(condition: unknown, message: string): asserts condition {
+  if (!condition) throw new Error(message);
+}
+
+function assertString(value: unknown, message: string): asserts value is string {
+  assert(typeof value === "string" && value.trim().length > 0, message);
+}
+
+function assertBoolean(value: unknown, message: string): asserts value is boolean {
+  assert(typeof value === "boolean", message);
+}
+
+function assertFiniteNumber(value: unknown, message: string): asserts value is number {
+  assert(typeof value === "number" && Number.isFinite(value), message);
+}
+
+function parseInstructionPayload(payload: unknown): InstructionBundlePayload {
+  assert(isRecord(payload), "Instruction payload must be an object.");
+  assertString(payload.name, "Instruction payload requires name.");
+  assert(payload.engine === "liquidjs", "Instruction payload requires engine=liquidjs.");
+  if (payload.kind === "basic") {
+    assertString(payload.templateText, "Basic instruction payload requires templateText.");
+    return {
+      name: payload.name,
+      kind: "basic",
+      engine: "liquidjs",
+      templateText: payload.templateText,
+      meta: isRecord(payload.meta) ? payload.meta : undefined,
+    };
+  }
+  assert(payload.kind === "st_base", "Instruction payload requires a supported kind.");
+  assert(typeof payload.stBase !== "undefined", "st_base instruction payload requires stBase.");
+  return {
+    name: payload.name,
+    kind: "st_base",
+    engine: "liquidjs",
+    stBase: payload.stBase as StBaseConfig,
+    meta: isRecord(payload.meta) ? payload.meta : undefined,
+  };
+}
+
+function parseOperationBlockPayload(payload: unknown): OperationBlockBundlePayload {
+  assert(isRecord(payload), "Operation block payload must be an object.");
+  assertString(payload.name, "Operation block payload requires name.");
+  assertBoolean(payload.enabled, "Operation block payload requires enabled.");
+  assert(Array.isArray(payload.operations), "Operation block payload requires operations array.");
+  return {
+    name: payload.name,
+    description: typeof payload.description === "string" ? payload.description : undefined,
+    enabled: payload.enabled,
+    operations: payload.operations as OperationInProfile[],
+    meta: payload.meta,
+  };
+}
+
+function parseOperationProfilePayload(payload: unknown): OperationProfileBundlePayload {
+  assert(isRecord(payload), "Operation profile payload must be an object.");
+  assertString(payload.name, "Operation profile payload requires name.");
+  assertBoolean(payload.enabled, "Operation profile payload requires enabled.");
+  assert(
+    payload.executionMode === "concurrent" || payload.executionMode === "sequential",
+    "Operation profile payload requires a supported executionMode."
+  );
+  assertString(payload.operationProfileSessionId, "Operation profile payload requires operationProfileSessionId.");
+  assert(Array.isArray(payload.blockRefs), "Operation profile payload requires blockRefs array.");
+  return {
+    name: payload.name,
+    description: typeof payload.description === "string" ? payload.description : undefined,
+    enabled: payload.enabled,
+    executionMode: payload.executionMode,
+    operationProfileSessionId: payload.operationProfileSessionId,
+    blockRefs: payload.blockRefs.map((ref) => {
+      assert(isRecord(ref), "Operation profile blockRef must be an object.");
+      assertString(ref.resourceId, "Operation profile blockRef requires resourceId.");
+      assertBoolean(ref.enabled, "Operation profile blockRef requires enabled.");
+      assertFiniteNumber(ref.order, "Operation profile blockRef requires finite order.");
+      return {
+        resourceId: ref.resourceId,
+        enabled: ref.enabled,
+        order: ref.order,
+      };
+    }),
+    meta: payload.meta,
+  };
+}
+
+function parseBundleFileDescriptor(value: unknown): BundleFileDescriptor {
+  assert(isRecord(value), "Bundle file descriptor must be an object.");
+  assertString(value.path, "Bundle file descriptor requires path.");
+  assertString(value.fileName, "Bundle file descriptor requires fileName.");
+  assertString(value.mediaType, "Bundle file descriptor requires mediaType.");
+  return {
+    path: value.path,
+    fileName: value.fileName,
+    mediaType: value.mediaType,
+    size: typeof value.size === "number" ? value.size : undefined,
+    sha256: typeof value.sha256 === "string" ? value.sha256 : undefined,
+  };
+}
+
+function parseWorldInfoBookPayload(payload: unknown): WorldInfoBookBundlePayload {
+  assert(isRecord(payload), "World info payload must be an object.");
+  assertString(payload.name, "World info payload requires name.");
+  return {
+    name: payload.name,
+    slug: typeof payload.slug === "string" ? payload.slug : undefined,
+    description:
+      typeof payload.description === "string" || payload.description === null
+        ? payload.description
+        : undefined,
+    data: payload.data,
+    extensions: payload.extensions,
+    source:
+      payload.source === "native" || payload.source === "imported" || payload.source === "converted"
+        ? payload.source
+        : undefined,
+  };
+}
+
+function parseEntityProfilePayload(payload: unknown): EntityProfileBundlePayload {
+  assert(isRecord(payload), "Entity profile payload must be an object.");
+  assertString(payload.name, "Entity profile payload requires name.");
+  assert(payload.kind === "CharSpec", "Entity profile payload requires kind=CharSpec.");
+  assertBoolean(payload.isFavorite, "Entity profile payload requires isFavorite.");
+  return {
+    name: payload.name,
+    kind: "CharSpec",
+    spec: payload.spec,
+    meta: payload.meta,
+    isFavorite: payload.isFavorite,
+    avatarFile: typeof payload.avatarFile === "undefined" ? undefined : parseBundleFileDescriptor(payload.avatarFile),
+  };
+}
+
+function parseUiThemePresetPayload(payload: unknown): UiThemePresetBundlePayload {
+  assert(isRecord(payload), "UI theme preset payload must be an object.");
+  assertString(payload.name, "UI theme preset payload requires name.");
+  return {
+    name: payload.name,
+    description: typeof payload.description === "string" ? payload.description : undefined,
+    payload: payload.payload as UiThemePresetPayload,
+  };
+}
+
+function parseResource(input: unknown): TaleSpinnerBundleResource {
+  assert(isRecord(input), "Bundle resource must be an object.");
+  assertString(input.resourceId, "Bundle resource requires resourceId.");
+  assertString(input.title, "Bundle resource requires title.");
+  assert(input.schemaVersion === 1, "Bundle resource requires schemaVersion=1.");
+  assert(
+    input.role === "primary" || input.role === "related" || input.role === "dependency",
+    "Bundle resource requires a supported role."
+  );
+
+  if (input.kind === "instruction") {
+    return {
+      resourceId: input.resourceId,
+      kind: "instruction",
+      schemaVersion: 1,
+      role: input.role,
+      title: input.title,
+      payload: parseInstructionPayload(input.payload),
+    };
+  }
+  if (input.kind === "operation_block") {
+    return {
+      resourceId: input.resourceId,
+      kind: "operation_block",
+      schemaVersion: 1,
+      role: input.role,
+      title: input.title,
+      payload: parseOperationBlockPayload(input.payload),
+    };
+  }
+  if (input.kind === "operation_profile") {
+    return {
+      resourceId: input.resourceId,
+      kind: "operation_profile",
+      schemaVersion: 1,
+      role: input.role,
+      title: input.title,
+      payload: parseOperationProfilePayload(input.payload),
+    };
+  }
+  if (input.kind === "world_info_book") {
+    return {
+      resourceId: input.resourceId,
+      kind: "world_info_book",
+      schemaVersion: 1,
+      role: input.role,
+      title: input.title,
+      payload: parseWorldInfoBookPayload(input.payload),
+    };
+  }
+  if (input.kind === "entity_profile") {
+    return {
+      resourceId: input.resourceId,
+      kind: "entity_profile",
+      schemaVersion: 1,
+      role: input.role,
+      title: input.title,
+      payload: parseEntityProfilePayload(input.payload),
+    };
+  }
+  if (input.kind === "ui_theme_preset") {
+    return {
+      resourceId: input.resourceId,
+      kind: "ui_theme_preset",
+      schemaVersion: 1,
+      role: input.role,
+      title: input.title,
+      payload: parseUiThemePresetPayload(input.payload),
+    };
+  }
+
+  throw new Error("Bundle resource requires a supported kind.");
+}
+
+export function createBundleResourceId(kind: TaleSpinnerBundleResourceKind, seed: string): string {
+  const normalized = seed.trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
+  return `${kind}:${normalized || "resource"}`;
+}
+
+export function parseTaleSpinnerBundle(input: unknown): TaleSpinnerBundle {
+  assert(isRecord(input), "Bundle must be an object.");
+  assert(input.type === TALESPINNER_BUNDLE_TYPE, `Bundle type must be ${TALESPINNER_BUNDLE_TYPE}.`);
+  assert(input.version === TALESPINNER_BUNDLE_VERSION, `Bundle version must be ${TALESPINNER_BUNDLE_VERSION}.`);
+  assertString(input.bundleId, "Bundle requires bundleId.");
+  assertString(input.createdAt, "Bundle requires createdAt.");
+  assert(input.container === "json" || input.container === "archive", "Bundle requires a supported container.");
+  assert(Array.isArray(input.resources) && input.resources.length > 0, "Bundle requires resources.");
+  if (typeof input.sourceResourceId !== "undefined") {
+    assertString(input.sourceResourceId, "sourceResourceId must be a non-empty string.");
+  }
+
+  return {
+    type: TALESPINNER_BUNDLE_TYPE,
+    version: TALESPINNER_BUNDLE_VERSION,
+    bundleId: input.bundleId,
+    createdAt: input.createdAt,
+    sourceResourceId: typeof input.sourceResourceId === "string" ? input.sourceResourceId : undefined,
+    container: input.container,
+    resources: input.resources.map(parseResource),
+  };
+}
+
+export function validateBundleResourceGraph(bundle: TaleSpinnerBundle): void {
+  const resourcesById = new Map(bundle.resources.map((resource) => [resource.resourceId, resource]));
+  if (bundle.sourceResourceId && !resourcesById.has(bundle.sourceResourceId)) {
+    throw new Error(`Unknown sourceResourceId: ${bundle.sourceResourceId}`);
+  }
+
+  bundle.resources.forEach((resource) => {
+    if (resource.kind !== "operation_profile") return;
+    resource.payload.blockRefs.forEach((ref) => {
+      const target = resourcesById.get(ref.resourceId);
+      if (!target || target.kind !== "operation_block") {
+        throw new Error(`Unknown operation_block resourceId: ${ref.resourceId}`);
+      }
+    });
+  });
+}
diff --git a/web/src/api/bundles.ts b/web/src/api/bundles.ts
new file mode 100644
index 00000000..d6ec01ba
--- /dev/null
+++ b/web/src/api/bundles.ts
@@ -0,0 +1,105 @@
+import { BASE_URL } from "../const";
+
+import type { TaleSpinnerBundleResourceKind } from "@shared/types/bundles";
+
+type ApiEnvelope<T> = { data: T; error?: unknown };
+
+export type BundleSelectionHandle = {
+  kind: TaleSpinnerBundleResourceKind;
+  id: string;
+};
+
+export type BundleImportResult = {
+  sourceResourceId?: string;
+  created: {
+    instructions: Array<{ resourceId: string; id: string; name: string }>;
+    operationBlocks: Array<{ resourceId: string; blockId: string; name: string }>;
+    operationProfiles: Array<{ resourceId: string; profileId: string; name: string }>;
+    worldInfoBooks: Array<{ resourceId: string; id: string; name: string }>;
+    entityProfiles: Array<{ resourceId: string; id: string; name: string }>;
+    uiThemePresets: Array<{ resourceId: string; presetId: string; name: string }>;
+  };
+  applied: {
+    instructionId: string | null;
+    operationProfileId: string | null;
+    uiThemePresetId: string | null;
+    entityProfileId: string | null;
+    worldInfoBookId: string | null;
+  };
+  skippedApply: Array<{
+    kind: "instruction" | "operation_profile" | "ui_theme_preset" | "entity_profile" | "world_info_book";
+    reason: "ambiguous";
+    message: string;
+  }>;
+  warnings: string[];
+};
+
+function sanitizeFileName(input: string): string {
+  return input.replace(/[\\/:*?"<>|]+/g, "_").trim();
+}
+
+export async function exportBundle(input: {
+  ownerId?: string;
+  source: BundleSelectionHandle;
+  selections: BundleSelectionHandle[];
+  format?: "json" | "archive" | "auto";
+}): Promise<{ blob: Blob; filename: string; contentType: string }> {
+  const res = await fetch(`${BASE_URL}/bundles/export`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(input),
+  });
+
+  if (!res.ok) {
+    const body = (await res.json().catch(() => ({}))) as Partial<ApiEnvelope<unknown>> & {
+      error?: { message?: string };
+    };
+    throw new Error(body?.error?.message ?? `HTTP error ${res.status}`);
+  }
+
+  const blob = await res.blob();
+  const contentType = res.headers.get("content-type") ?? blob.type ?? "application/octet-stream";
+  const disposition = res.headers.get("content-disposition") ?? "";
+  const utf8Match = disposition.match(/filename\*=UTF-8''([^;]+)/i);
+  const plainMatch = disposition.match(/filename="?([^"]+)"?/i);
+  const rawName = utf8Match?.[1]
+    ? decodeURIComponent(utf8Match[1])
+    : plainMatch?.[1] ?? `talespinner-bundle.${contentType.includes("json") ? "json" : "tsbundle"}`;
+
+  return {
+    blob,
+    filename: sanitizeFileName(rawName),
+    contentType,
+  };
+}
+
+export async function importBundle(file: File): Promise<BundleImportResult> {
+  const form = new FormData();
+  form.append("file", file);
+
+  const res = await fetch(`${BASE_URL}/bundles/import`, {
+    method: "POST",
+    body: form,
+  });
+
+  const body = (await res.json().catch(() => ({}))) as Partial<ApiEnvelope<BundleImportResult>> & {
+    error?: { message?: string };
+  };
+  if (!res.ok) {
+    throw new Error(body?.error?.message ?? `HTTP error ${res.status}`);
+  }
+  return body.data as BundleImportResult;
+}
+
+export function downloadBlobFile(filename: string, blob: Blob): void {
+  const url = URL.createObjectURL(blob);
+  const link = document.createElement("a");
+  link.href = url;
+  link.download = filename;
+  document.body.appendChild(link);
+  link.click();
+  document.body.removeChild(link);
+  URL.revokeObjectURL(url);
+}
diff --git a/web/src/features/sidebars/app-settings/index.tsx b/web/src/features/sidebars/app-settings/index.tsx
index 3bad516a..beab22e2 100644
--- a/web/src/features/sidebars/app-settings/index.tsx
+++ b/web/src/features/sidebars/app-settings/index.tsx
@@ -20,8 +20,6 @@ import { type AppSettings } from "@shared/types/app-settings";
 import {
   DEFAULT_UI_THEME_PAYLOAD,
   UI_THEME_BUILT_IN_IDS,
-  UI_THEME_EXPORT_TYPE,
-  type UiThemeExportV1,
 } from "@shared/types/ui-theme";
 import { useUnit } from "effector-react";
 import React, { useEffect, useMemo, useRef, useState } from "react";
@@ -45,8 +43,6 @@ import {
   $uiThemeSettings,
   createUiThemePresetFx,
   deleteUiThemePresetFx,
-  exportUiThemePresetFx,
-  importUiThemePresetsFx,
   patchUiThemeSettingsFx,
   updateUiThemePresetFx,
 } from "@model/ui-themes";
@@ -54,7 +50,8 @@ import { Drawer } from "@ui/drawer";
 import { FormCheckbox, FormSelect } from "@ui/form-components";
 import { toaster } from "@ui/toaster";
 
-import { downloadJsonFile } from "../../../api/ui-theme";
+import { downloadBlobFile, exportBundle, importBundle } from "../../../api/bundles";
+import { resolveBundleAutoApplyTargets } from "../common/bundle-helpers";
 
 type AppSettingsTab = "general" | "theming" | "debug";
 type ColorSchemeValue = "light" | "dark" | "auto";
@@ -214,8 +211,12 @@ export const AppSettingsSidebar: React.FC = () => {
   const handleExportPreset = async () => {
     if (!draftPreset) return;
     try {
-      const exported = await exportUiThemePresetFx(draftPreset.presetId);
-      downloadJsonFile(`ui-theme-${draftPreset.name}.json`, exported);
+      const exported = await exportBundle({
+        source: { kind: "ui_theme_preset", id: draftPreset.presetId },
+        selections: [{ kind: "ui_theme_preset", id: draftPreset.presetId }],
+        format: "auto",
+      });
+      downloadBlobFile(exported.filename, exported.blob);
     } catch (error) {
       toaster.error({
         title: t("appSettings.theming.toasts.exportFailed"),
@@ -227,17 +228,23 @@ export const AppSettingsSidebar: React.FC = () => {
   const handleImportPreset = async (file: File | null) => {
     if (!file) return;
     try {
-      const content = await file.text();
-      const parsed = JSON.parse(content) as UiThemeExportV1 | UiThemeExportV1[];
-      const items = Array.isArray(parsed) ? parsed : [parsed];
-      if (items.some((item) => item?.type !== UI_THEME_EXPORT_TYPE)) {
-        throw new Error(t("appSettings.theming.errors.invalidFormat"));
+      const imported = await importBundle(file);
+      const applyTargets = resolveBundleAutoApplyTargets(imported);
+      if (applyTargets.uiThemePresetId) {
+        await patchUiThemeSettingsFx({ activePresetId: applyTargets.uiThemePresetId });
       }
-      const imported = await importUiThemePresetsFx(items);
-      const first = imported.created[0];
-      if (first) {
-        await patchUiThemeSettingsFx({ activePresetId: first.presetId });
+      if (applyTargets.warnings.length > 0) {
+        toaster.warning({
+          title: t("appSettings.theming.toasts.importDone"),
+          description: applyTargets.warnings.join(" "),
+        });
       }
+      toaster.success({
+        title: t("appSettings.theming.toasts.importDone"),
+        description: t("appSettings.theming.toasts.importedCount", {
+          count: imported.created.uiThemePresets.length,
+        }),
+      });
     } catch (error) {
       toaster.error({
         title: t("appSettings.theming.toasts.importFailed"),
diff --git a/web/src/features/sidebars/common/bundle-helpers.test.ts b/web/src/features/sidebars/common/bundle-helpers.test.ts
new file mode 100644
index 00000000..3e1fbf68
--- /dev/null
+++ b/web/src/features/sidebars/common/bundle-helpers.test.ts
@@ -0,0 +1,128 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  getBundleExportCandidateCopy,
+  resolveBundleAutoApplyTargets,
+  resolveInstructionBundleExportCandidates,
+  toggleBundleCandidateSelection,
+} from "./bundle-helpers";
+
+describe("bundle helpers", () => {
+  it("prefers source resource for auto-apply", () => {
+    const resolved = resolveBundleAutoApplyTargets({
+      sourceResourceId: "instruction:main",
+      created: {
+        instructions: [
+          { resourceId: "instruction:main", id: "inst-1", name: "Main" },
+          { resourceId: "instruction:alt", id: "inst-2", name: "Alt" },
+        ],
+        operationBlocks: [],
+        operationProfiles: [],
+        worldInfoBooks: [],
+        entityProfiles: [],
+        uiThemePresets: [],
+      },
+      applied: {
+        instructionId: "inst-1",
+        operationProfileId: null,
+        uiThemePresetId: null,
+        entityProfileId: null,
+        worldInfoBookId: null,
+      },
+      skippedApply: [],
+      warnings: [],
+    });
+
+    expect(resolved.instructionId).toBe("inst-1");
+    expect(resolved.warnings).toEqual([]);
+  });
+
+  it("skips ambiguous auto-apply targets without source match", () => {
+    const resolved = resolveBundleAutoApplyTargets({
+      created: {
+        instructions: [
+          { resourceId: "instruction:main", id: "inst-1", name: "Main" },
+          { resourceId: "instruction:alt", id: "inst-2", name: "Alt" },
+        ],
+        operationBlocks: [],
+        operationProfiles: [],
+        worldInfoBooks: [],
+        entityProfiles: [],
+        uiThemePresets: [],
+      },
+      applied: {
+        instructionId: null,
+        operationProfileId: null,
+        uiThemePresetId: null,
+        entityProfileId: null,
+        worldInfoBookId: null,
+      },
+      skippedApply: [
+        {
+          kind: "instruction",
+          reason: "ambiguous",
+          message: "Skipped auto-apply for instruction: ambiguous imported resources.",
+        },
+      ],
+      warnings: [],
+    });
+
+    expect(resolved.instructionId).toBeNull();
+    expect(resolved.warnings).toContain("Skipped auto-apply for instruction: ambiguous imported resources.");
+  });
+
+  it("builds instruction export candidates with source preselected", () => {
+    const candidates = resolveInstructionBundleExportCandidates({
+      sourceInstruction: { id: "inst-1", name: "Main instruction" },
+      activeOperationProfile: { profileId: "prof-1", name: "Main profile" },
+      activeUiThemePreset: { presetId: "theme-1", name: "Night" },
+      currentEntityProfile: { id: "entity-1", name: "Hero" },
+      currentWorldInfoBooks: [{ id: "book-1", name: "Lore" }],
+    });
+
+    expect(candidates).toEqual([
+      expect.objectContaining({ key: "instruction:inst-1", checkedByDefault: true }),
+      expect.objectContaining({ key: "operation_profile:prof-1", checkedByDefault: false }),
+      expect.objectContaining({ key: "ui_theme_preset:theme-1", checkedByDefault: false }),
+      expect.objectContaining({ key: "entity_profile:entity-1", checkedByDefault: false }),
+      expect.objectContaining({ key: "world_info_book:book-1", checkedByDefault: false }),
+    ]);
+  });
+
+  it("toggles bundle selection without relying on synthetic event state", () => {
+    expect(toggleBundleCandidateSelection(["instruction:1"], "operation_profile:1", true)).toEqual([
+      "instruction:1",
+      "operation_profile:1",
+    ]);
+    expect(toggleBundleCandidateSelection(["instruction:1"], "instruction:1", true)).toEqual([
+      "instruction:1",
+    ]);
+    expect(toggleBundleCandidateSelection(["instruction:1", "operation_profile:1"], "instruction:1", false)).toEqual([
+      "operation_profile:1",
+    ]);
+  });
+
+  it("provides descriptive copy metadata for export candidates", () => {
+    const sourceCandidate = {
+      key: "instruction:inst-1",
+      label: "Main instruction",
+      handle: { kind: "instruction" as const, id: "inst-1" },
+      checkedByDefault: true,
+    };
+    const profileCandidate = {
+      key: "operation_profile:prof-1",
+      label: "Main profile",
+      handle: { kind: "operation_profile" as const, id: "prof-1" },
+      checkedByDefault: false,
+    };
+
+    expect(getBundleExportCandidateCopy(sourceCandidate)).toEqual({
+      kindLabelKey: "instructions.bundle.candidates.kinds.instruction",
+      descriptionKey: "instructions.bundle.candidates.descriptions.sourceInstruction",
+    });
+    expect(getBundleExportCandidateCopy(profileCandidate)).toEqual({
+      kindLabelKey: "instructions.bundle.candidates.kinds.operationProfile",
+      descriptionKey: "instructions.bundle.candidates.descriptions.operationProfile",
+    });
+  });
+});
diff --git a/web/src/features/sidebars/common/bundle-helpers.ts b/web/src/features/sidebars/common/bundle-helpers.ts
new file mode 100644
index 00000000..1f70f62e
--- /dev/null
+++ b/web/src/features/sidebars/common/bundle-helpers.ts
@@ -0,0 +1,133 @@
+import type { BundleImportResult, BundleSelectionHandle } from "../../../api/bundles";
+
+export type BundleApplyTargets = {
+  instructionId: string | null;
+  operationProfileId: string | null;
+  uiThemePresetId: string | null;
+  entityProfileId: string | null;
+  worldInfoBookId: string | null;
+  warnings: string[];
+};
+
+export type BundleExportCandidate = {
+  key: string;
+  label: string;
+  handle: BundleSelectionHandle;
+  checkedByDefault: boolean;
+};
+
+export type BundleExportCandidateCopy = {
+  kindLabelKey: string;
+  descriptionKey: string;
+};
+
+export function resolveBundleAutoApplyTargets(result: BundleImportResult): BundleApplyTargets {
+  return {
+    instructionId: result.applied.instructionId,
+    operationProfileId: result.applied.operationProfileId,
+    uiThemePresetId: result.applied.uiThemePresetId,
+    entityProfileId: result.applied.entityProfileId,
+    worldInfoBookId: result.applied.worldInfoBookId,
+    warnings: [...result.warnings, ...result.skippedApply.map((item) => item.message)],
+  };
+}
+
+export function toggleBundleCandidateSelection(currentKeys: string[], key: string, checked: boolean): string[] {
+  if (checked) {
+    return currentKeys.includes(key) ? currentKeys : [...currentKeys, key];
+  }
+
+  return currentKeys.filter((item) => item !== key);
+}
+
+export function getBundleExportCandidateCopy(candidate: BundleExportCandidate): BundleExportCandidateCopy {
+  if (candidate.handle.kind === "instruction") {
+    return {
+      kindLabelKey: "instructions.bundle.candidates.kinds.instruction",
+      descriptionKey: candidate.checkedByDefault
+        ? "instructions.bundle.candidates.descriptions.sourceInstruction"
+        : "instructions.bundle.candidates.descriptions.instruction",
+    };
+  }
+
+  if (candidate.handle.kind === "operation_profile") {
+    return {
+      kindLabelKey: "instructions.bundle.candidates.kinds.operationProfile",
+      descriptionKey: "instructions.bundle.candidates.descriptions.operationProfile",
+    };
+  }
+
+  if (candidate.handle.kind === "ui_theme_preset") {
+    return {
+      kindLabelKey: "instructions.bundle.candidates.kinds.uiThemePreset",
+      descriptionKey: "instructions.bundle.candidates.descriptions.uiThemePreset",
+    };
+  }
+
+  if (candidate.handle.kind === "entity_profile") {
+    return {
+      kindLabelKey: "instructions.bundle.candidates.kinds.entityProfile",
+      descriptionKey: "instructions.bundle.candidates.descriptions.entityProfile",
+    };
+  }
+
+  return {
+    kindLabelKey: "instructions.bundle.candidates.kinds.worldInfoBook",
+    descriptionKey: "instructions.bundle.candidates.descriptions.worldInfoBook",
+  };
+}
+
+export function resolveInstructionBundleExportCandidates(params: {
+  sourceInstruction: { id: string; name: string };
+  activeOperationProfile?: { profileId: string; name: string } | null;
+  activeUiThemePreset?: { presetId: string; name: string } | null;
+  currentEntityProfile?: { id: string; name: string } | null;
+  currentWorldInfoBooks?: Array<{ id: string; name: string }>;
+}): BundleExportCandidate[] {
+  const candidates: BundleExportCandidate[] = [
+    {
+      key: `instruction:${params.sourceInstruction.id}`,
+      label: params.sourceInstruction.name,
+      handle: { kind: "instruction", id: params.sourceInstruction.id },
+      checkedByDefault: true,
+    },
+  ];
+
+  if (params.activeOperationProfile) {
+    candidates.push({
+      key: `operation_profile:${params.activeOperationProfile.profileId}`,
+      label: params.activeOperationProfile.name,
+      handle: { kind: "operation_profile", id: params.activeOperationProfile.profileId },
+      checkedByDefault: false,
+    });
+  }
+
+  if (params.activeUiThemePreset) {
+    candidates.push({
+      key: `ui_theme_preset:${params.activeUiThemePreset.presetId}`,
+      label: params.activeUiThemePreset.name,
+      handle: { kind: "ui_theme_preset", id: params.activeUiThemePreset.presetId },
+      checkedByDefault: false,
+    });
+  }
+
+  if (params.currentEntityProfile) {
+    candidates.push({
+      key: `entity_profile:${params.currentEntityProfile.id}`,
+      label: params.currentEntityProfile.name,
+      handle: { kind: "entity_profile", id: params.currentEntityProfile.id },
+      checkedByDefault: false,
+    });
+  }
+
+  (params.currentWorldInfoBooks ?? []).forEach((book) => {
+    candidates.push({
+      key: `world_info_book:${book.id}`,
+      label: book.name,
+      handle: { kind: "world_info_book", id: book.id },
+      checkedByDefault: false,
+    });
+  });
+
+  return candidates;
+}
diff --git a/web/src/features/sidebars/instructions/index.tsx b/web/src/features/sidebars/instructions/index.tsx
index adeb479e..99e9bb78 100644
--- a/web/src/features/sidebars/instructions/index.tsx
+++ b/web/src/features/sidebars/instructions/index.tsx
@@ -30,6 +30,7 @@ import { toaster } from '@ui/toaster';
 import { getDefaultStPreset } from '../../../api/instructions';
 import { getRuntime, patchRuntime } from '../../../api/llm';
 
+import { InstructionBundleActions } from './instruction-bundle-actions';
 import { InstructionEditor } from './instruction-editor';
 
 import type { CreateInstructionDraft, InstructionDto } from '../../../api/instructions';
@@ -747,6 +748,7 @@ export const InstructionsSidebar = () => {
 							aria-label={t('instructions.presets.actions.import')}
 							onClick={() => fileInputRef.current?.click()}
 						/>
+						<InstructionBundleActions selectedInstruction={selectedInstruction} />
 						<IconButtonWithTooltip
 							tooltip={t('instructions.presets.actions.export')}
 							icon={<EXPORT_FILE_ICON size={16} />}
diff --git a/web/src/features/sidebars/instructions/instruction-bundle-actions.tsx b/web/src/features/sidebars/instructions/instruction-bundle-actions.tsx
new file mode 100644
index 00000000..0fb99cf0
--- /dev/null
+++ b/web/src/features/sidebars/instructions/instruction-bundle-actions.tsx
@@ -0,0 +1,266 @@
+import { Button, Checkbox, Group, Modal, Stack, Text } from "@mantine/core";
+import { useUnit } from "effector-react";
+import React, { useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { LuPackage, LuPackageOpen } from "react-icons/lu";
+
+import { $currentChat, $currentEntityProfile, $entityProfiles, loadEntityProfilesFx, selectEntityProfile, setChatInstructionRequested } from "@model/chat-core";
+import { instructionSelected, loadInstructionsFx } from "@model/instructions";
+import { loadOperationBlocksFx } from "@model/operation-blocks";
+import { $operationProfileSettings, $operationProfiles, loadActiveOperationProfileFx, loadOperationProfilesFx, setActiveOperationProfileRequested } from "@model/operation-profiles";
+import { $activeUiThemePreset, loadUiThemePresetsFx, loadUiThemeSettingsFx, patchUiThemeSettingsFx } from "@model/ui-themes";
+import { $worldInfoBooks, $worldInfoChatBindings, loadWorldInfoBooksFx, worldInfoBookSelected } from "@model/world-info";
+import { IconButtonWithTooltip } from "@ui/icon-button-with-tooltip";
+import { toaster } from "@ui/toaster";
+
+import { downloadBlobFile, exportBundle, importBundle } from "../../../api/bundles";
+import {
+  getBundleExportCandidateCopy,
+  resolveBundleAutoApplyTargets,
+  resolveInstructionBundleExportCandidates,
+  toggleBundleCandidateSelection,
+} from "../common/bundle-helpers";
+
+import type { InstructionDto } from "../../../api/instructions";
+
+type Props = {
+  selectedInstruction: InstructionDto | null;
+};
+
+export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction }) => {
+  const { t } = useTranslation();
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const [opened, setOpened] = useState(false);
+  const [selectedKeys, setSelectedKeys] = useState<string[]>([]);
+  const [
+    currentChat,
+    currentEntityProfile,
+    entityProfiles,
+    operationProfiles,
+    operationProfileSettings,
+    activeUiThemePreset,
+    worldInfoBooks,
+    worldInfoChatBindings,
+  ] = useUnit([
+    $currentChat,
+    $currentEntityProfile,
+    $entityProfiles,
+    $operationProfiles,
+    $operationProfileSettings,
+    $activeUiThemePreset,
+    $worldInfoBooks,
+    $worldInfoChatBindings,
+  ]);
+  const [
+    refreshInstructions,
+    refreshProfiles,
+    refreshProfileSettings,
+    refreshBlocks,
+    refreshThemes,
+    refreshThemeSettings,
+    refreshEntities,
+    refreshWorldInfo,
+    applyEntityProfile,
+    applyWorldInfoBook,
+    applyOperationProfile,
+    applyThemePreset,
+  ] = useUnit([
+    loadInstructionsFx,
+    loadOperationProfilesFx,
+    loadActiveOperationProfileFx,
+    loadOperationBlocksFx,
+    loadUiThemePresetsFx,
+    loadUiThemeSettingsFx,
+    loadEntityProfilesFx,
+    loadWorldInfoBooksFx,
+    selectEntityProfile,
+    worldInfoBookSelected,
+    setActiveOperationProfileRequested,
+    patchUiThemeSettingsFx,
+  ]);
+
+  const activeOperationProfile = useMemo(() => {
+    const activeId = operationProfileSettings?.activeProfileId ?? null;
+    return operationProfiles.find((item) => item.profileId === activeId) ?? null;
+  }, [operationProfileSettings?.activeProfileId, operationProfiles]);
+
+  const currentWorldInfoBooks = useMemo(() => {
+    const enabledIds = new Set(
+      worldInfoChatBindings.filter((item) => item.enabled).map((item) => item.bookId)
+    );
+    return worldInfoBooks
+      .filter((item) => enabledIds.has(item.id))
+      .map((item) => ({ id: item.id, name: item.name }));
+  }, [worldInfoBooks, worldInfoChatBindings]);
+
+  const candidates = useMemo(() => {
+    if (!selectedInstruction) return [];
+    return resolveInstructionBundleExportCandidates({
+      sourceInstruction: { id: selectedInstruction.id, name: selectedInstruction.name },
+      activeOperationProfile: activeOperationProfile
+        ? { profileId: activeOperationProfile.profileId, name: activeOperationProfile.name }
+        : null,
+      activeUiThemePreset: activeUiThemePreset
+        ? { presetId: activeUiThemePreset.presetId, name: activeUiThemePreset.name }
+        : null,
+      currentEntityProfile: currentEntityProfile
+        ? { id: currentEntityProfile.id, name: currentEntityProfile.name }
+        : null,
+      currentWorldInfoBooks,
+    });
+  }, [activeOperationProfile, activeUiThemePreset, currentEntityProfile, currentWorldInfoBooks, selectedInstruction]);
+
+  useEffect(() => {
+    if (!opened) return;
+    setSelectedKeys(candidates.filter((item) => item.checkedByDefault).map((item) => item.key));
+  }, [candidates, opened]);
+
+  const handleBundleExport = async () => {
+    if (!selectedInstruction) return;
+    const selections = candidates
+      .filter((item) => selectedKeys.includes(item.key))
+      .map((item) => item.handle);
+    if (selections.length === 0) {
+      toaster.error({
+        title: t("instructions.bundle.toasts.exportErrorTitle"),
+        description: t("instructions.bundle.toasts.selectAtLeastOne"),
+      });
+      return;
+    }
+
+    const exported = await exportBundle({
+      source: { kind: "instruction", id: selectedInstruction.id },
+      selections,
+      format: "auto",
+    });
+    downloadBlobFile(exported.filename, exported.blob);
+    setOpened(false);
+  };
+
+  const handleBundleImport = async (file: File | null) => {
+    if (!file) return;
+    const imported = await importBundle(file);
+    const [, , , , , , reloadedEntities] = await Promise.all([
+      refreshInstructions(),
+      refreshProfiles(),
+      refreshProfileSettings(),
+      refreshBlocks(),
+      refreshThemes(),
+      refreshThemeSettings(),
+      refreshEntities(),
+      refreshWorldInfo(),
+    ]);
+
+    const applyTargets = resolveBundleAutoApplyTargets(imported);
+    if (applyTargets.instructionId) {
+      if (currentChat?.id) {
+        setChatInstructionRequested({ instructionId: applyTargets.instructionId });
+      } else {
+        instructionSelected(applyTargets.instructionId);
+      }
+    }
+    if (applyTargets.operationProfileId) {
+      applyOperationProfile(applyTargets.operationProfileId);
+    }
+    if (applyTargets.uiThemePresetId) {
+      await applyThemePreset({ activePresetId: applyTargets.uiThemePresetId });
+    }
+    if (applyTargets.entityProfileId) {
+      const profile = (reloadedEntities ?? entityProfiles).find((item) => item.id === applyTargets.entityProfileId);
+      if (profile) {
+        applyEntityProfile(profile);
+      }
+    }
+    if (applyTargets.worldInfoBookId) {
+      applyWorldInfoBook(applyTargets.worldInfoBookId);
+    }
+    if (applyTargets.warnings.length > 0) {
+      toaster.warning({
+        title: t("instructions.bundle.toasts.importWarningTitle"),
+        description: applyTargets.warnings.join(" "),
+      });
+    }
+    const totalImported =
+      imported.created.instructions.length +
+      imported.created.operationProfiles.length +
+      imported.created.entityProfiles.length +
+      imported.created.uiThemePresets.length +
+      imported.created.worldInfoBooks.length;
+    toaster.success({
+      title: t("instructions.bundle.toasts.importSuccessTitle"),
+      description: t("instructions.bundle.toasts.importedCount", { count: totalImported }),
+    });
+  };
+
+  return (
+    <>
+      <input
+        ref={fileInputRef}
+        type="file"
+        accept=".json,.tsbundle"
+        style={{ display: "none" }}
+        onChange={(event) => {
+          const file = event.currentTarget.files?.[0] ?? null;
+          void handleBundleImport(file)
+            .catch((error) => {
+              toaster.error({
+                title: t("instructions.bundle.toasts.importErrorTitle"),
+                description: error instanceof Error ? error.message : String(error),
+              });
+            })
+            .finally(() => {
+              event.currentTarget.value = "";
+            });
+        }}
+      />
+
+      <Modal opened={opened} onClose={() => setOpened(false)} title={t("instructions.bundle.dialogs.exportTitle")} centered>
+        <Stack gap="md">
+          <Text size="sm" c="dimmed">
+            {t("instructions.bundle.dialogs.exportDescription")}
+          </Text>
+          {candidates.map((candidate) => {
+            const copy = getBundleExportCandidateCopy(candidate);
+
+            return (
+              <Checkbox
+                key={candidate.key}
+                checked={selectedKeys.includes(candidate.key)}
+                onChange={(event) => {
+                  const checked = event.currentTarget.checked;
+                  setSelectedKeys((current) =>
+                    toggleBundleCandidateSelection(current, candidate.key, checked)
+                  );
+                }}
+                label={`${t(copy.kindLabelKey)}: ${candidate.label}`}
+                description={t(copy.descriptionKey)}
+              />
+            );
+          })}
+          <Group justify="flex-end">
+            <Button variant="default" onClick={() => setOpened(false)}>
+              {t("common.cancel")}
+            </Button>
+            <Button onClick={() => void handleBundleExport()} disabled={!selectedInstruction}>
+              {t("instructions.bundle.actions.export")}
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+
+      <IconButtonWithTooltip
+        tooltip={t("instructions.bundle.actions.import")}
+        icon={<LuPackageOpen size={16} />}
+        aria-label={t("instructions.bundle.actions.import")}
+        onClick={() => fileInputRef.current?.click()}
+      />
+      <IconButtonWithTooltip
+        tooltip={t("instructions.bundle.actions.export")}
+        icon={<LuPackage size={16} />}
+        aria-label={t("instructions.bundle.actions.export")}
+        disabled={!selectedInstruction}
+        onClick={() => setOpened(true)}
+      />
+    </>
+  );
+};
diff --git a/web/src/features/sidebars/operation-profiles/index.tsx b/web/src/features/sidebars/operation-profiles/index.tsx
index 05ee3ae4..2ba96bdb 100644
--- a/web/src/features/sidebars/operation-profiles/index.tsx
+++ b/web/src/features/sidebars/operation-profiles/index.tsx
@@ -10,8 +10,6 @@ import {
 	createOperationBlockFx,
 	deleteOperationBlockFx,
 	duplicateOperationBlockRequested,
-	exportOperationBlockFx,
-	importOperationBlocksFx,
 	loadOperationBlocksFx,
 } from '@model/operation-blocks';
 import {
@@ -20,17 +18,19 @@ import {
 	createOperationProfileFx,
 	deleteOperationProfileFx,
 	duplicateOperationProfileRequested,
-	exportOperationProfileFx,
-	importOperationProfilesFx,
 	loadActiveOperationProfileFx,
 	loadOperationProfilesFx,
-	setActiveOperationProfileRequested
+	setActiveOperationProfileRequested,
 } from '@model/operation-profiles';
 import { $sidebars } from '@model/sidebars';
 import { Drawer } from '@ui/drawer';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
+import { toaster } from '@ui/toaster';
 import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
 
+import { exportBundle, importBundle } from '../../../api/bundles';
+import { resolveBundleAutoApplyTargets } from '../common/bundle-helpers';
+
 import { OperationBlockNodeEditorModal } from './node-editor/block-node-editor-modal';
 import { OperationBlockEditor, type OperationBlockToolbarState } from './operation-block-editor';
 import { OperationProfileBlocksEditor, type OperationProfileBlocksToolbarState } from './operation-profile-blocks-editor';
@@ -57,14 +57,10 @@ export const OperationProfilesSidebar: React.FC = () => {
 	const doCreateProfile = useUnit(createOperationProfileFx);
 	const doDeleteProfile = useUnit(deleteOperationProfileFx);
 	const doSetActiveProfile = useUnit(setActiveOperationProfileRequested);
-	const doExportProfile = useUnit(exportOperationProfileFx);
-	const doImportProfiles = useUnit(importOperationProfilesFx);
 	const doDuplicateProfile = useUnit(duplicateOperationProfileRequested);
 
 	const doCreateBlock = useUnit(createOperationBlockFx);
 	const doDeleteBlock = useUnit(deleteOperationBlockFx);
-	const doExportBlock = useUnit(exportOperationBlockFx);
-	const doImportBlocks = useUnit(importOperationBlocksFx);
 	const doDuplicateBlock = useUnit(duplicateOperationBlockRequested);
 
 	const [activeTab, setActiveTab] = React.useState<TabValue>('profiles');
@@ -93,6 +89,49 @@ export const OperationProfilesSidebar: React.FC = () => {
 	const selectedProfile = profiles.find((p) => p.profileId === currentProfileId) ?? null;
 	const selectedBlock = blocks.find((b) => b.blockId === selectedBlockId) ?? null;
 
+	const handleImportProfiles = async (file: File) => {
+		const result = await importBundle(file);
+		await loadProfiles();
+		await loadBlocks();
+		const applyTargets = resolveBundleAutoApplyTargets(result);
+		if (applyTargets.operationProfileId) {
+			doSetActiveProfile(applyTargets.operationProfileId);
+		}
+		if (applyTargets.warnings.length > 0) {
+			toaster.warning({
+				title: t('operationProfiles.toasts.importTitle'),
+				description: applyTargets.warnings.join(' '),
+			});
+		}
+		toaster.success({
+			title: t('operationProfiles.toasts.importTitle'),
+			description: t('operationProfiles.toasts.importedCount', {
+				count: result.created.operationProfiles.length,
+			}),
+		});
+	};
+
+	const handleImportBlocks = async (file: File) => {
+		const result = await importBundle(file);
+		await loadBlocks();
+		const firstBlockId = result.created.operationBlocks[0]?.blockId ?? null;
+		if (firstBlockId) {
+			setSelectedBlockId(firstBlockId);
+		}
+		if (result.warnings.length > 0) {
+			toaster.warning({
+				title: t('operationProfiles.toasts.importTitle'),
+				description: result.warnings.join(' '),
+			});
+		}
+		toaster.success({
+			title: t('operationProfiles.toasts.importTitle'),
+			description: t('operationProfiles.toasts.importedCount', {
+				count: result.created.operationBlocks.length,
+			}),
+		});
+	};
+
 	const sidebarState = sidebars.operationProfiles;
 	const preferSplitLayout = sidebarState.isFullscreen || sidebarState.size === 'full';
 	const uiClassName = preferSplitLayout ? 'op-ui' : 'op-ui op-ui--drawer';
@@ -127,9 +166,19 @@ export const OperationProfilesSidebar: React.FC = () => {
 									}
 									onDuplicate={(profileId) => doDuplicateProfile({ sourceProfileId: profileId })}
 									onDelete={(profileId) => doDeleteProfile({ profileId })}
-									onExport={(profileId) => doExportProfile(profileId)}
-									onImport={async (payload) => {
-										await doImportProfiles(payload as any);
+									onExport={async (profileId) => {
+										const exported = await exportBundle({
+											source: { kind: 'operation_profile', id: profileId },
+											selections: [{ kind: 'operation_profile', id: profileId }],
+											format: 'auto',
+										});
+										return {
+											blob: exported.blob,
+											filename: exported.filename,
+										};
+									}}
+									onImport={async (file) => {
+										await handleImportProfiles(file);
 									}}
 								/>
 							</div>
@@ -225,9 +274,19 @@ export const OperationProfilesSidebar: React.FC = () => {
 									}}
 									onDuplicate={(blockId) => doDuplicateBlock({ sourceBlockId: blockId })}
 									onDelete={(blockId) => doDeleteBlock({ blockId })}
-									onExport={(blockId) => doExportBlock(blockId)}
-									onImport={async (payload) => {
-										await doImportBlocks(payload as any);
+									onExport={async (blockId) => {
+										const exported = await exportBundle({
+											source: { kind: 'operation_block', id: blockId },
+											selections: [{ kind: 'operation_block', id: blockId }],
+											format: 'auto',
+										});
+										return {
+											blob: exported.blob,
+											filename: exported.filename,
+										};
+									}}
+									onImport={async (file) => {
+										await handleImportBlocks(file);
 									}}
 								/>
 							</div>
diff --git a/web/src/features/sidebars/operation-profiles/ui/block-actions.tsx b/web/src/features/sidebars/operation-profiles/ui/block-actions.tsx
index 3eeb3159..dc981fb5 100644
--- a/web/src/features/sidebars/operation-profiles/ui/block-actions.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/block-actions.tsx
@@ -11,8 +11,7 @@ import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
 type SelectedBlock = { blockId: string; name: string } | null;
 const QUICK_ACTION_TOOLTIP_SETTINGS = TOOLTIP_PORTAL_SETTINGS;
 
-function downloadJson(filename: string, data: unknown) {
-	const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' });
+function downloadJson(filename: string, blob: Blob) {
 	const url = URL.createObjectURL(blob);
 	const a = document.createElement('a');
 	a.href = url;
@@ -28,8 +27,8 @@ type Props = {
 	onCreate: () => void;
 	onDuplicate: (blockId: string) => void;
 	onDelete: (blockId: string) => void;
-	onExport: (blockId: string) => Promise<unknown>;
-	onImport: (payload: unknown) => Promise<void>;
+	onExport: (blockId: string) => Promise<{ blob: Blob; filename: string }>;
+	onImport: (file: File) => Promise<void>;
 };
 
 export const BlockActions: React.FC<Props> = ({ selected, onCreate, onDuplicate, onDelete, onExport, onImport }) => {
@@ -82,7 +81,7 @@ export const BlockActions: React.FC<Props> = ({ selected, onCreate, onDuplicate,
 					if (!selected?.blockId) return;
 					try {
 						const exported = await onExport(selected.blockId);
-						downloadJson(`operation-block-${selected.name}.json`, exported);
+						downloadJson(exported.filename, exported.blob);
 					} catch (e) {
 						toaster.error({
 							title: t('operationProfiles.toasts.exportError'),
@@ -100,22 +99,16 @@ export const BlockActions: React.FC<Props> = ({ selected, onCreate, onDuplicate,
 				onChange={(e) => {
 					const file = e.currentTarget.files?.[0];
 					if (!file) return;
-					const reader = new FileReader();
-					reader.onload = async () => {
-						try {
-							const text = String(reader.result ?? '');
-							const parsed = JSON.parse(text) as unknown;
-							await onImport(parsed);
-						} catch (err) {
+					void onImport(file)
+						.catch((err) => {
 							toaster.error({
 								title: t('operationProfiles.toasts.importError'),
 								description: err instanceof Error ? err.message : String(err),
 							});
-						} finally {
+						})
+						.finally(() => {
 							e.currentTarget.value = '';
-						}
-					};
-					reader.readAsText(file);
+						});
 				}}
 			/>
 
diff --git a/web/src/features/sidebars/operation-profiles/ui/profile-actions.tsx b/web/src/features/sidebars/operation-profiles/ui/profile-actions.tsx
index 06bb1edd..8cec79d3 100644
--- a/web/src/features/sidebars/operation-profiles/ui/profile-actions.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/profile-actions.tsx
@@ -11,8 +11,7 @@ import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
 type SelectedProfile = { profileId: string; name: string } | null;
 const QUICK_ACTION_TOOLTIP_SETTINGS = TOOLTIP_PORTAL_SETTINGS;
 
-function downloadJson(filename: string, data: unknown) {
-	const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' });
+function downloadJson(filename: string, blob: Blob) {
 	const url = URL.createObjectURL(blob);
 	const a = document.createElement('a');
 	a.href = url;
@@ -28,8 +27,8 @@ type Props = {
 	onCreate: () => void;
 	onDuplicate: (profileId: string) => void;
 	onDelete: (profileId: string) => void;
-	onExport: (profileId: string) => Promise<unknown>;
-	onImport: (payload: unknown) => Promise<void>;
+	onExport: (profileId: string) => Promise<{ blob: Blob; filename: string }>;
+	onImport: (file: File) => Promise<void>;
 };
 
 export const ProfileActions: React.FC<Props> = ({ selected, onCreate, onDuplicate, onDelete, onExport, onImport }) => {
@@ -82,7 +81,7 @@ export const ProfileActions: React.FC<Props> = ({ selected, onCreate, onDuplicat
 					if (!selected?.profileId) return;
 					try {
 						const exported = await onExport(selected.profileId);
-						downloadJson(`operation-profile-${selected.name}.json`, exported);
+						downloadJson(exported.filename, exported.blob);
 					} catch (e) {
 						toaster.error({
 							title: t('operationProfiles.toasts.exportError'),
@@ -100,22 +99,16 @@ export const ProfileActions: React.FC<Props> = ({ selected, onCreate, onDuplicat
 				onChange={(e) => {
 					const file = e.currentTarget.files?.[0];
 					if (!file) return;
-					const reader = new FileReader();
-					reader.onload = async () => {
-						try {
-							const text = String(reader.result ?? '');
-							const parsed = JSON.parse(text) as unknown;
-							await onImport(parsed);
-						} catch (err) {
+					void onImport(file)
+						.catch((err) => {
 							toaster.error({
 								title: t('operationProfiles.toasts.importError'),
 								description: err instanceof Error ? err.message : String(err),
 							});
-						} finally {
+						})
+						.finally(() => {
 							e.currentTarget.value = '';
-						}
-					};
-					reader.readAsText(file);
+						});
 				}}
 			/>
 
diff --git a/web/src/i18n/resources/en/instructions.ts b/web/src/i18n/resources/en/instructions.ts
index 444103a5..5684b59d 100644
--- a/web/src/i18n/resources/en/instructions.ts
+++ b/web/src/i18n/resources/en/instructions.ts
@@ -93,6 +93,41 @@ const enInstructions = {
 		discardTitle: 'Discard changes?',
 		sensitiveImportTitle: 'Sensitive import fields',
 	},
+	bundle: {
+		actions: {
+			import: 'Import TaleSpinner set',
+			export: 'Export TaleSpinner set',
+		},
+		dialogs: {
+			exportTitle: 'Export TaleSpinner set',
+			exportDescription: 'Choose the active/current resources to include in the bundle.',
+		},
+		candidates: {
+			kinds: {
+				instruction: 'Instruction',
+				operationProfile: 'Operation profile',
+				uiThemePreset: 'UI theme preset',
+				entityProfile: 'Entity profile',
+				worldInfoBook: 'World info book',
+			},
+			descriptions: {
+				sourceInstruction: 'Source instruction. Selected by default and imported as a new instruction preset.',
+				instruction: 'Instruction. Imported as a new instruction preset.',
+				operationProfile: 'Active operation profile. Its related enabled operation blocks will be exported with it.',
+				uiThemePreset: 'Active UI theme preset. It can be applied immediately after import.',
+				entityProfile: 'Current entity profile. Its avatar is included as well when present.',
+				worldInfoBook: 'Active world info book from the current chat. Imported as a separate book.',
+			},
+		},
+		toasts: {
+			exportErrorTitle: 'Bundle export failed',
+			importErrorTitle: 'Bundle import failed',
+			importWarningTitle: 'Bundle imported with warnings',
+			importSuccessTitle: 'Bundle imported',
+			selectAtLeastOne: 'Select at least one resource to export.',
+			importedCount: 'Imported resources: {{count}}',
+		},
+	},
 	validation: {
 		promptIdentifierRequired: 'Provide a block identifier.',
 		promptIdentifierInvalid: 'Identifier may contain only letters, numbers, dots, underscores, and hyphens.',
diff --git a/web/src/i18n/resources/ru/instructions.ts b/web/src/i18n/resources/ru/instructions.ts
index 940341eb..76400e38 100644
--- a/web/src/i18n/resources/ru/instructions.ts
+++ b/web/src/i18n/resources/ru/instructions.ts
@@ -93,6 +93,41 @@ const ruInstructions = {
 		discardTitle: 'Отбросить изменения?',
 		sensitiveImportTitle: 'Чувствительные поля импорта',
 	},
+	bundle: {
+		actions: {
+			import: 'Импортировать набор TaleSpinner',
+			export: 'Экспортировать набор TaleSpinner',
+		},
+		dialogs: {
+			exportTitle: 'Экспорт набора TaleSpinner',
+			exportDescription: 'Выберите активные и текущие сущности, которые нужно включить в набор.',
+		},
+		candidates: {
+			kinds: {
+				instruction: 'Инструкция',
+				operationProfile: 'Профиль операций',
+				uiThemePreset: 'Тема интерфейса',
+				entityProfile: 'Профиль сущности',
+				worldInfoBook: 'Книга мира',
+			},
+			descriptions: {
+				sourceInstruction: 'Исходная инструкция. Выбрана по умолчанию и импортируется как новый пресет инструкции.',
+				instruction: 'Инструкция. Импортируется как новый пресет инструкции.',
+				operationProfile: 'Активный профиль операций. Связанные включённые блоки операций будут экспортированы вместе с ним.',
+				uiThemePreset: 'Активный пресет темы интерфейса. После импорта его можно сразу применить.',
+				entityProfile: 'Текущий профиль сущности. Если у него есть аватар, он тоже войдёт в набор.',
+				worldInfoBook: 'Активная книга World Info из текущего чата. Импортируется как отдельная книга.',
+			},
+		},
+		toasts: {
+			exportErrorTitle: 'Не удалось экспортировать набор',
+			importErrorTitle: 'Не удалось импортировать набор',
+			importWarningTitle: 'Набор импортирован с предупреждениями',
+			importSuccessTitle: 'Набор импортирован',
+			selectAtLeastOne: 'Выберите хотя бы одну сущность для экспорта.',
+			importedCount: 'Импортировано сущностей: {{count}}',
+		},
+	},
 	validation: {
 		promptIdentifierRequired: 'Укажите identifier для блока.',
 		promptIdentifierInvalid: 'Identifier может содержать только буквы, цифры, точки, подчёркивания и дефисы.',

From bd08b78aced06a33f89cf4f30382ff9b9aa51014 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 14 Mar 2026 23:22:10 +0300
Subject: [PATCH 17/54] Add import export for sampler

---
 server/src/api/bundles.core.api.ts            |   1 +
 .../services/bundles/bundle-contract.test.ts  |  42 ++++++
 .../bundles/bundle-import-export.test.ts      | 129 ++++++++++++++++++
 .../bundles/export-bundle-selection.ts        |  20 +++
 .../services/bundles/import-bundle-file.ts    |  42 ++++++
 server/src/services/samplers.service.ts       |  10 ++
 shared/types/bundles.ts                       |  33 ++++-
 web/src/api/bundles.ts                        |   4 +-
 .../llm-provider/sampler-settings-grid.tsx    |  66 +++++----
 .../sidebars/common/bundle-helpers.test.ts    |  42 ++++++
 .../sidebars/common/bundle-helpers.ts         |  19 +++
 .../instruction-bundle-actions.tsx            |  26 +++-
 .../sidebars/settings/preset-controls.tsx     |  87 ++++++++----
 .../sidebars/settings/settings-tab.tsx        | 114 ++++++++++++++--
 web/src/i18n/resources/en/instructions.ts     |   2 +
 web/src/i18n/resources/en/llmSettings.ts      |  10 ++
 web/src/i18n/resources/ru/instructions.ts     |   2 +
 web/src/i18n/resources/ru/llmSettings.ts      |  10 ++
 18 files changed, 587 insertions(+), 72 deletions(-)

diff --git a/server/src/api/bundles.core.api.ts b/server/src/api/bundles.core.api.ts
index ac16a9fb..b7ec4134 100644
--- a/server/src/api/bundles.core.api.ts
+++ b/server/src/api/bundles.core.api.ts
@@ -21,6 +21,7 @@ const resourceKindSchema = z.enum([
   "world_info_book",
   "entity_profile",
   "ui_theme_preset",
+  "sampler_preset",
 ]);
 
 const exportBodySchema = z
diff --git a/server/src/services/bundles/bundle-contract.test.ts b/server/src/services/bundles/bundle-contract.test.ts
index 11fe67b2..1ec1739a 100644
--- a/server/src/services/bundles/bundle-contract.test.ts
+++ b/server/src/services/bundles/bundle-contract.test.ts
@@ -6,6 +6,48 @@ import {
 import { describe, expect, test } from "vitest";
 
 describe("bundle contract", () => {
+  test("parses valid sampler preset resource", () => {
+    const samplerResourceId = createBundleResourceId("sampler_preset", "storyteller");
+
+    const parsed = parseTaleSpinnerBundle({
+      type: "talespinner.bundle",
+      version: 1,
+      bundleId: "bundle-sampler-1",
+      createdAt: "2026-03-13T10:00:00.000Z",
+      container: "json",
+      sourceResourceId: samplerResourceId,
+      resources: [
+        {
+          resourceId: samplerResourceId,
+          kind: "sampler_preset",
+          schemaVersion: 1,
+          role: "primary",
+          title: "Storyteller",
+          payload: {
+            name: "Storyteller",
+            settings: {
+              temperature: 0.9,
+              topP: 0.95,
+              reasoning: {
+                enabled: true,
+                effort: "medium",
+              },
+            },
+          },
+        },
+      ],
+    });
+
+    expect(parsed.resources).toHaveLength(1);
+    expect(parsed.resources[0]).toMatchObject({
+      kind: "sampler_preset",
+      payload: {
+        name: "Storyteller",
+      },
+    });
+    expect(() => validateBundleResourceGraph(parsed)).not.toThrow();
+  });
+
   test("parses valid bundle manifest", () => {
     const blockResourceId = createBundleResourceId("operation_block", "scene");
     const profileResourceId = createBundleResourceId("operation_profile", "main");
diff --git a/server/src/services/bundles/bundle-import-export.test.ts b/server/src/services/bundles/bundle-import-export.test.ts
index ed5a31b8..20cfb5f3 100644
--- a/server/src/services/bundles/bundle-import-export.test.ts
+++ b/server/src/services/bundles/bundle-import-export.test.ts
@@ -11,6 +11,7 @@ import { ensureOperationBlocksCutover } from "../../db/ensure-operation-blocks-c
 import { createInstruction } from "../chat-core/instructions-repository";
 import { createOperationBlock, listOperationBlocks } from "../operations/operation-blocks-repository";
 import { createOperationProfile, getOperationProfileById } from "../operations/operation-profiles-repository";
+import { samplersService } from "../samplers.service";
 import { createUiThemePreset } from "../ui-theme/ui-theme-repository";
 
 import { exportBundleSelection } from "./export-bundle-selection";
@@ -19,6 +20,10 @@ import { importBundleFile } from "./import-bundle-file";
 describe("bundle import/export", () => {
   let tempDir = "";
   let dbPath = "";
+  let prevSamplersDir = "";
+  let prevSamplersReady: Promise<void> | null = null;
+  let prevSamplerConfigPath = "";
+  let prevSamplerConfigReady: Promise<void> | null = null;
 
   beforeEach(async () => {
     resetDbForTests();
@@ -28,10 +33,43 @@ describe("bundle import/export", () => {
     await applyMigrations();
     await ensureInstructionsSchema();
     await ensureOperationBlocksCutover();
+
+    const samplerDir = path.join(tempDir, "samplers");
+    const samplerConfigPath = path.join(tempDir, "config", "samplers.json");
+    const samplersStore = samplersService.samplers as unknown as {
+      dir: string;
+      ready: Promise<void>;
+    };
+    const samplersSettingsStore = samplersService.samplersSettings as unknown as {
+      configPath: string;
+      ready: Promise<void>;
+    };
+
+    prevSamplersDir = samplersStore.dir;
+    prevSamplersReady = samplersStore.ready;
+    prevSamplerConfigPath = samplersSettingsStore.configPath;
+    prevSamplerConfigReady = samplersSettingsStore.ready;
+
+    samplersStore.dir = samplerDir;
+    samplersStore.ready = fs.mkdir(samplerDir, { recursive: true }).then(() => undefined);
+    samplersSettingsStore.configPath = samplerConfigPath;
+    samplersSettingsStore.ready = fs.mkdir(path.dirname(samplerConfigPath), { recursive: true }).then(() => undefined);
   });
 
   afterEach(async () => {
     resetDbForTests();
+    const samplersStore = samplersService.samplers as unknown as {
+      dir: string;
+      ready: Promise<void>;
+    };
+    const samplersSettingsStore = samplersService.samplersSettings as unknown as {
+      configPath: string;
+      ready: Promise<void>;
+    };
+    samplersStore.dir = prevSamplersDir;
+    samplersStore.ready = prevSamplersReady ?? Promise.resolve();
+    samplersSettingsStore.configPath = prevSamplerConfigPath;
+    samplersSettingsStore.ready = prevSamplerConfigReady ?? Promise.resolve();
     if (tempDir) {
       await fs.rm(tempDir, { recursive: true, force: true });
     }
@@ -141,6 +179,46 @@ describe("bundle import/export", () => {
     expect(imported.warnings).toContain("Imported legacy UI theme preset format.");
   });
 
+  test("exports and imports sampler preset bundle with auto-apply", async () => {
+    await samplersService.samplers.create({
+      id: "sampler-1",
+      name: "Storyteller",
+      createdAt: "2026-03-13T10:00:00.000Z",
+      updatedAt: "2026-03-13T10:00:00.000Z",
+      settings: {
+        temperature: 0.9,
+        topP: 0.95,
+        maxTokens: 4096,
+        reasoning: {
+          enabled: true,
+          effort: "medium",
+        },
+      },
+    });
+
+    const exported = await exportBundleSelection({
+      ownerId: "global",
+      source: { kind: "sampler_preset", id: "sampler-1" },
+      selections: [{ kind: "sampler_preset", id: "sampler-1" }],
+      format: "json",
+    });
+
+    const imported = await importBundleFile({
+      ownerId: "global",
+      fileName: exported.fileName,
+      buffer: exported.buffer,
+    });
+
+    expect(imported.created.samplerPresets).toHaveLength(1);
+    expect(imported.created.samplerPresets[0]?.presetId).not.toBe("sampler-1");
+    expect(imported.applied.samplerPresetId).toBe(imported.created.samplerPresets[0]?.presetId ?? null);
+    expect(imported.skippedApply).toEqual([]);
+
+    const samplers = await samplersService.samplers.getAll();
+    expect(samplers).toHaveLength(2);
+    expect(samplers.some((item) => item.id === imported.created.samplerPresets[0]?.presetId)).toBe(true);
+  });
+
   test("reports ambiguous auto-apply targets when bundle has multiple resources of same kind without source", async () => {
     const bundlePayload = JSON.stringify({
       type: "talespinner.bundle",
@@ -191,4 +269,55 @@ describe("bundle import/export", () => {
       message: "Skipped auto-apply for instruction: ambiguous imported resources.",
     });
   });
+
+  test("reports ambiguous sampler auto-apply targets without source", async () => {
+    const bundlePayload = JSON.stringify({
+      type: "talespinner.bundle",
+      version: 1,
+      bundleId: "bundle-sampler-ambiguous",
+      createdAt: "2026-03-13T10:00:00.000Z",
+      container: "json",
+      resources: [
+        {
+          resourceId: "sampler_preset:one",
+          kind: "sampler_preset",
+          schemaVersion: 1,
+          role: "related",
+          title: "One",
+          payload: {
+            name: "One",
+            settings: {
+              temperature: 0.7,
+            },
+          },
+        },
+        {
+          resourceId: "sampler_preset:two",
+          kind: "sampler_preset",
+          schemaVersion: 1,
+          role: "related",
+          title: "Two",
+          payload: {
+            name: "Two",
+            settings: {
+              temperature: 1.1,
+            },
+          },
+        },
+      ],
+    });
+
+    const imported = await importBundleFile({
+      ownerId: "global",
+      fileName: "ambiguous-samplers.json",
+      buffer: Buffer.from(bundlePayload, "utf8"),
+    });
+
+    expect(imported.applied.samplerPresetId).toBeNull();
+    expect(imported.skippedApply).toContainEqual({
+      kind: "sampler_preset",
+      reason: "ambiguous",
+      message: "Skipped auto-apply for sampler preset: ambiguous imported resources.",
+    });
+  });
 });
diff --git a/server/src/services/bundles/export-bundle-selection.ts b/server/src/services/bundles/export-bundle-selection.ts
index 0ee68835..703733dc 100644
--- a/server/src/services/bundles/export-bundle-selection.ts
+++ b/server/src/services/bundles/export-bundle-selection.ts
@@ -15,6 +15,7 @@ import { getEntityProfileById } from "../chat-core/entity-profiles-repository";
 import { getInstructionById } from "../chat-core/instructions-repository";
 import { getOperationBlockById } from "../operations/operation-blocks-repository";
 import { getOperationProfileById } from "../operations/operation-profiles-repository";
+import { samplersService } from "../samplers.service";
 import { getUiThemePresetById } from "../ui-theme/ui-theme-repository";
 import { getWorldInfoBookById } from "../world-info/world-info-repositories";
 
@@ -232,6 +233,25 @@ export async function exportBundleSelection(params: {
         },
       });
       if (handle.kind === params.source.kind && handle.id === params.source.id) sourceResourceId = resourceId;
+      return;
+    }
+
+    if (handle.kind === "sampler_preset") {
+      const preset = await samplersService.samplers.getById(handle.id);
+      if (!preset) throw new Error(`Sampler preset not found: ${handle.id}`);
+      const resourceId = createBundleResourceId("sampler_preset", `${preset.name}-${preset.id}`);
+      resources.push({
+        resourceId,
+        kind: "sampler_preset",
+        schemaVersion: 1,
+        role,
+        title: preset.name,
+        payload: {
+          name: preset.name,
+          settings: preset.settings,
+        },
+      });
+      if (handle.kind === params.source.kind && handle.id === params.source.id) sourceResourceId = resourceId;
     }
   };
 
diff --git a/server/src/services/bundles/import-bundle-file.ts b/server/src/services/bundles/import-bundle-file.ts
index 94b5e6c8..9c1ca2d6 100644
--- a/server/src/services/bundles/import-bundle-file.ts
+++ b/server/src/services/bundles/import-bundle-file.ts
@@ -1,9 +1,12 @@
+import { randomUUID } from "node:crypto";
+
 import {
   type EntityProfileBundleResource,
   type InstructionBundleResource,
   type OperationBlockBundleResource,
   type OperationProfileBundleResource,
   parseTaleSpinnerBundle,
+  type SamplerPresetBundleResource,
   type TaleSpinnerBundle,
   type UiThemePresetBundleResource,
   validateBundleResourceGraph,
@@ -17,6 +20,7 @@ import { createEntityProfile } from "../chat-core/entity-profiles-repository";
 import { createInstruction, listInstructions } from "../chat-core/instructions-repository";
 import { createOperationBlock, listOperationBlocks, resolveImportedOperationBlockName } from "../operations/operation-blocks-repository";
 import { createOperationProfile, listOperationProfiles } from "../operations/operation-profiles-repository";
+import { resolveImportedSamplerPresetName, samplersService } from "../samplers.service";
 import { createUiThemePreset, listUiThemePresets, resolveImportedPresetName } from "../ui-theme/ui-theme-repository";
 import { createWorldInfoBook } from "../world-info/world-info-repositories";
 
@@ -66,11 +70,16 @@ function isUiThemePresetResource(resource: TaleSpinnerBundle["resources"][number
   return resource.kind === "ui_theme_preset";
 }
 
+function isSamplerPresetResource(resource: TaleSpinnerBundle["resources"][number]): resource is SamplerPresetBundleResource {
+  return resource.kind === "sampler_preset";
+}
+
 type CreatedResourceItem = { resourceId: string };
 type AutoApplyKind =
   | "instruction"
   | "operation_profile"
   | "ui_theme_preset"
+  | "sampler_preset"
   | "entity_profile"
   | "world_info_book";
 
@@ -78,6 +87,7 @@ type BundleAppliedTargets = {
   instructionId: string | null;
   operationProfileId: string | null;
   uiThemePresetId: string | null;
+  samplerPresetId: string | null;
   entityProfileId: string | null;
   worldInfoBookId: string | null;
 };
@@ -133,6 +143,7 @@ export async function importBundleFile(params: {
     worldInfoBooks: Array<{ resourceId: string; id: string; name: string }>;
     entityProfiles: Array<{ resourceId: string; id: string; name: string }>;
     uiThemePresets: Array<{ resourceId: string; presetId: string; name: string }>;
+    samplerPresets: Array<{ resourceId: string; presetId: string; name: string }>;
   };
   applied: BundleAppliedTargets;
   skippedApply: BundleSkippedApplyItem[];
@@ -160,11 +171,13 @@ export async function importBundleFile(params: {
     listOperationProfiles({ ownerId: params.ownerId }),
     listUiThemePresets({ ownerId: params.ownerId }),
   ]);
+  const existingSamplerPresets = await samplersService.samplers.getAll();
 
   const instructionNames = new Set(existingInstructions.map((item) => item.name));
   const blockNames = new Set(existingBlocks.map((item) => item.name));
   const profileNames = new Set(existingProfiles.map((item) => item.name));
   const themeNames = new Set(existingThemes.map((item) => item.name));
+  const samplerPresetNames = new Set(existingSamplerPresets.map((item) => item.name));
   const blockIdMap = new Map<string, string>();
 
   const created = {
@@ -174,6 +187,7 @@ export async function importBundleFile(params: {
     worldInfoBooks: [] as Array<{ resourceId: string; id: string; name: string }>,
     entityProfiles: [] as Array<{ resourceId: string; id: string; name: string }>,
     uiThemePresets: [] as Array<{ resourceId: string; presetId: string; name: string }>,
+    samplerPresets: [] as Array<{ resourceId: string; presetId: string; name: string }>,
   };
   const warnings: string[] = [];
 
@@ -307,6 +321,25 @@ export async function importBundleFile(params: {
     });
   }
 
+  for (const resource of bundle.resources.filter(isSamplerPresetResource)) {
+    const presetId = randomUUID();
+    const now = new Date().toISOString();
+    const name = resolveImportedSamplerPresetName(resource.payload.name, Array.from(samplerPresetNames));
+    samplerPresetNames.add(name);
+    const preset = await samplersService.samplers.create({
+      id: presetId,
+      name,
+      settings: resource.payload.settings,
+      createdAt: now,
+      updatedAt: now,
+    });
+    created.samplerPresets.push({
+      resourceId: resource.resourceId,
+      presetId: preset.id,
+      name: preset.name,
+    });
+  }
+
   if (params.fileName.endsWith(".json") && params.buffer.toString("utf8").includes(UI_THEME_EXPORT_TYPE)) {
     warnings.push("Imported legacy UI theme preset format.");
   }
@@ -332,6 +365,13 @@ export async function importBundleFile(params: {
     "UI theme preset",
     (item) => item.presetId
   );
+  const samplerPresetApply = resolveAppliedTarget(
+    created.samplerPresets,
+    bundle.sourceResourceId,
+    "sampler_preset",
+    "sampler preset",
+    (item) => item.presetId
+  );
   const entityProfileApply = resolveAppliedTarget(
     created.entityProfiles,
     bundle.sourceResourceId,
@@ -350,6 +390,7 @@ export async function importBundleFile(params: {
     instructionApply.skipped,
     operationProfileApply.skipped,
     uiThemePresetApply.skipped,
+    samplerPresetApply.skipped,
     entityProfileApply.skipped,
     worldInfoBookApply.skipped,
   ].filter((item): item is BundleSkippedApplyItem => Boolean(item));
@@ -361,6 +402,7 @@ export async function importBundleFile(params: {
       instructionId: instructionApply.value,
       operationProfileId: operationProfileApply.value,
       uiThemePresetId: uiThemePresetApply.value,
+      samplerPresetId: samplerPresetApply.value,
       entityProfileId: entityProfileApply.value,
       worldInfoBookId: worldInfoBookApply.value,
     },
diff --git a/server/src/services/samplers.service.ts b/server/src/services/samplers.service.ts
index 571e13bd..88a10143 100644
--- a/server/src/services/samplers.service.ts
+++ b/server/src/services/samplers.service.ts
@@ -22,6 +22,16 @@ class SamplersSettings extends ConfigService<SamplersSettingsType> {
   }
 }
 
+export function resolveImportedSamplerPresetName(input: string, existingNames: string[]): string {
+  const base = input.trim() || "Imported sampler preset";
+  if (!existingNames.includes(base)) return base;
+  for (let idx = 2; idx <= 9999; idx += 1) {
+    const candidate = `${base} (imported ${idx})`;
+    if (!existingNames.includes(candidate)) return candidate;
+  }
+  return `${base} (imported ${Date.now()})`;
+}
+
 export const samplersService = {
   samplers: new Samplers(),
   samplersSettings: new SamplersSettings(),
diff --git a/shared/types/bundles.ts b/shared/types/bundles.ts
index ad057b5d..43c7666b 100644
--- a/shared/types/bundles.ts
+++ b/shared/types/bundles.ts
@@ -1,5 +1,6 @@
 import type { InstructionMeta, StBaseConfig } from "./instructions";
 import type { OperationExecutionMode, OperationInProfile } from "./operation-profiles";
+import type { SamplerItemSettingsType } from "./samplers";
 import type { UiThemePresetPayload } from "./ui-theme";
 
 export const TALESPINNER_BUNDLE_TYPE = "talespinner.bundle";
@@ -15,7 +16,8 @@ export type TaleSpinnerBundleResourceKind =
   | "operation_profile"
   | "world_info_book"
   | "entity_profile"
-  | "ui_theme_preset";
+  | "ui_theme_preset"
+  | "sampler_preset";
 
 export type BundleFileDescriptor = {
   path: string;
@@ -87,6 +89,11 @@ export type UiThemePresetBundlePayload = {
   payload: UiThemePresetPayload;
 };
 
+export type SamplerPresetBundlePayload = {
+  name: string;
+  settings: SamplerItemSettingsType;
+};
+
 type BundleResourceBase<TKind extends TaleSpinnerBundleResourceKind, TPayload> = {
   resourceId: string;
   kind: TKind;
@@ -102,6 +109,7 @@ export type OperationProfileBundleResource = BundleResourceBase<"operation_profi
 export type WorldInfoBookBundleResource = BundleResourceBase<"world_info_book", WorldInfoBookBundlePayload>;
 export type EntityProfileBundleResource = BundleResourceBase<"entity_profile", EntityProfileBundlePayload>;
 export type UiThemePresetBundleResource = BundleResourceBase<"ui_theme_preset", UiThemePresetBundlePayload>;
+export type SamplerPresetBundleResource = BundleResourceBase<"sampler_preset", SamplerPresetBundlePayload>;
 
 export type TaleSpinnerBundleResource =
   | InstructionBundleResource
@@ -109,7 +117,8 @@ export type TaleSpinnerBundleResource =
   | OperationProfileBundleResource
   | WorldInfoBookBundleResource
   | EntityProfileBundleResource
-  | UiThemePresetBundleResource;
+  | UiThemePresetBundleResource
+  | SamplerPresetBundleResource;
 
 export type TaleSpinnerBundle = {
   type: typeof TALESPINNER_BUNDLE_TYPE;
@@ -269,6 +278,16 @@ function parseUiThemePresetPayload(payload: unknown): UiThemePresetBundlePayload
   };
 }
 
+function parseSamplerPresetPayload(payload: unknown): SamplerPresetBundlePayload {
+  assert(isRecord(payload), "Sampler preset payload must be an object.");
+  assertString(payload.name, "Sampler preset payload requires name.");
+  assert(isRecord(payload.settings), "Sampler preset payload requires settings object.");
+  return {
+    name: payload.name,
+    settings: payload.settings as SamplerItemSettingsType,
+  };
+}
+
 function parseResource(input: unknown): TaleSpinnerBundleResource {
   assert(isRecord(input), "Bundle resource must be an object.");
   assertString(input.resourceId, "Bundle resource requires resourceId.");
@@ -339,6 +358,16 @@ function parseResource(input: unknown): TaleSpinnerBundleResource {
       payload: parseUiThemePresetPayload(input.payload),
     };
   }
+  if (input.kind === "sampler_preset") {
+    return {
+      resourceId: input.resourceId,
+      kind: "sampler_preset",
+      schemaVersion: 1,
+      role: input.role,
+      title: input.title,
+      payload: parseSamplerPresetPayload(input.payload),
+    };
+  }
 
   throw new Error("Bundle resource requires a supported kind.");
 }
diff --git a/web/src/api/bundles.ts b/web/src/api/bundles.ts
index d6ec01ba..4d201f2d 100644
--- a/web/src/api/bundles.ts
+++ b/web/src/api/bundles.ts
@@ -18,16 +18,18 @@ export type BundleImportResult = {
     worldInfoBooks: Array<{ resourceId: string; id: string; name: string }>;
     entityProfiles: Array<{ resourceId: string; id: string; name: string }>;
     uiThemePresets: Array<{ resourceId: string; presetId: string; name: string }>;
+    samplerPresets: Array<{ resourceId: string; presetId: string; name: string }>;
   };
   applied: {
     instructionId: string | null;
     operationProfileId: string | null;
     uiThemePresetId: string | null;
+    samplerPresetId: string | null;
     entityProfileId: string | null;
     worldInfoBookId: string | null;
   };
   skippedApply: Array<{
-    kind: "instruction" | "operation_profile" | "ui_theme_preset" | "entity_profile" | "world_info_book";
+    kind: "instruction" | "operation_profile" | "ui_theme_preset" | "sampler_preset" | "entity_profile" | "world_info_book";
     reason: "ambiguous";
     message: string;
   }>;
diff --git a/web/src/features/llm-provider/sampler-settings-grid.tsx b/web/src/features/llm-provider/sampler-settings-grid.tsx
index b834a369..e1ca87e1 100644
--- a/web/src/features/llm-provider/sampler-settings-grid.tsx
+++ b/web/src/features/llm-provider/sampler-settings-grid.tsx
@@ -1,4 +1,4 @@
-import { ActionIcon, Flex, NumberInput, Paper, Select, SimpleGrid, Slider, Switch, Tooltip } from '@mantine/core';
+import { ActionIcon, Box, Group, NumberInput, Select, SimpleGrid, Slider, Switch, Text, Tooltip } from '@mantine/core';
 import React from 'react';
 import { useController, type Control } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -27,10 +27,11 @@ function toBoolean(value: unknown, fallback: boolean): boolean {
 
 export const SamplerSettingsGrid: React.FC<Props> = ({ control, fields, fieldPrefix, columns = 3 }) => {
 	return (
-		<SimpleGrid cols={columns} spacing="md">
+		<SimpleGrid cols={columns} spacing="sm">
 			{fields.map((field) => (
 				<SamplerSettingsGridItem
 					key={field.key}
+					columns={columns}
 					control={control}
 					field={field}
 					name={buildFieldName(fieldPrefix, field.key)}
@@ -41,12 +42,21 @@ export const SamplerSettingsGrid: React.FC<Props> = ({ control, fields, fieldPre
 };
 
 type ItemProps = {
+	columns: number;
 	control: Control<any>;
 	field: LLMSettingField;
 	name: string;
 };
 
-const SamplerSettingsGridItem: React.FC<ItemProps> = ({ control, field, name }) => {
+const FIELD_CONTAINER_STYLE = {
+	border: '1px solid var(--mantine-color-default-border)',
+	borderRadius: 'var(--mantine-radius-md)',
+	background: 'var(--mantine-color-body)',
+} as const;
+
+const NUMBER_INPUT_WIDTH = 108;
+
+const SamplerSettingsGridItem: React.FC<ItemProps> = ({ columns, control, field, name }) => {
 	const { t } = useTranslation();
 	const formField = useController({
 		name,
@@ -58,22 +68,24 @@ const SamplerSettingsGridItem: React.FC<ItemProps> = ({ control, field, name })
 	const numericValue = toNumber(formField.field.value, numericFallback);
 	const boolValue = toBoolean(formField.field.value, boolFallback);
 	const textValue = typeof formField.field.value === 'string' ? formField.field.value : textFallback;
+	const span = Math.min(field.width, columns);
 
 	return (
-		<Paper withBorder radius="md" p="md" style={{ gridColumn: `span ${field.width}` }}>
-			<Flex align="flex-start" justify="space-between" mb="xs">
-				<Flex align="center" gap="xs" style={{ flex: 1, minWidth: 0 }}>
-					<span style={{ fontSize: 14, fontWeight: 500 }}>{field.label}</span>
-					<Tooltip label={field.tooltip} position="bottom" withArrow>
-						<ActionIcon variant="subtle" aria-label={t('common.info')}>
+		<Box p="sm" style={{ ...FIELD_CONTAINER_STYLE, gridColumn: `span ${span}` }}>
+			<Group gap={6} mb={8} wrap="nowrap">
+				<Text size="sm" fw={500} style={{ flex: 1, minWidth: 0 }}>
+					{field.label}
+				</Text>
+				<Tooltip label={field.tooltip} position="bottom" withArrow>
+					<ActionIcon variant="subtle" size="sm" aria-label={t('common.info')}>
 							<LuInfo />
 						</ActionIcon>
 					</Tooltip>
-				</Flex>
-			</Flex>
+			</Group>
 
 			{field.type === 'switch' ? (
 				<Switch
+					size="md"
 					checked={boolValue}
 					onChange={(event) => {
 						formField.field.onChange(event.currentTarget.checked);
@@ -83,6 +95,7 @@ const SamplerSettingsGridItem: React.FC<ItemProps> = ({ control, field, name })
 
 			{field.type === 'select' ? (
 				<Select
+					size="sm"
 					data={field.options?.map((option) => ({ value: option.value, label: option.label })) ?? []}
 					value={textValue}
 					onChange={(nextValue) => {
@@ -95,6 +108,7 @@ const SamplerSettingsGridItem: React.FC<ItemProps> = ({ control, field, name })
 
 			{field.type === 'number' ? (
 				<NumberInput
+					size="sm"
 					min={field.min}
 					max={field.max}
 					step={field.step}
@@ -109,22 +123,26 @@ const SamplerSettingsGridItem: React.FC<ItemProps> = ({ control, field, name })
 			) : null}
 
 			{field.type === 'range' ? (
-				<>
-					<Slider
-						min={field.min}
-						max={field.max}
-						step={field.step}
-						value={numericValue}
-						onChange={(nextValue) => {
-							formField.field.onChange(nextValue);
-						}}
-					/>
+				<Group gap="sm" align="center" wrap="nowrap">
+					<Box style={{ flex: 1, minWidth: 0, paddingInline: 4 }}>
+						<Slider
+							size="sm"
+							min={field.min}
+							max={field.max}
+							step={field.step}
+							value={numericValue}
+							onChange={(nextValue) => {
+								formField.field.onChange(nextValue);
+							}}
+						/>
+					</Box>
 					<NumberInput
-						mt="xs"
+						size="sm"
 						min={field.min}
 						max={field.max}
 						step={field.step}
 						value={numericValue}
+						style={{ width: NUMBER_INPUT_WIDTH, flex: `0 0 ${NUMBER_INPUT_WIDTH}px` }}
 						onChange={(nextValue) => {
 							formField.field.onChange(typeof nextValue === 'number' ? nextValue : numericFallback);
 						}}
@@ -132,8 +150,8 @@ const SamplerSettingsGridItem: React.FC<ItemProps> = ({ control, field, name })
 							formField.field.onBlur();
 						}}
 					/>
-				</>
+				</Group>
 			) : null}
-		</Paper>
+		</Box>
 	);
 };
diff --git a/web/src/features/sidebars/common/bundle-helpers.test.ts b/web/src/features/sidebars/common/bundle-helpers.test.ts
index 3e1fbf68..913a28bd 100644
--- a/web/src/features/sidebars/common/bundle-helpers.test.ts
+++ b/web/src/features/sidebars/common/bundle-helpers.test.ts
@@ -21,6 +21,7 @@ describe("bundle helpers", () => {
         worldInfoBooks: [],
         entityProfiles: [],
         uiThemePresets: [],
+        samplerPresets: [],
       },
       applied: {
         instructionId: "inst-1",
@@ -28,6 +29,7 @@ describe("bundle helpers", () => {
         uiThemePresetId: null,
         entityProfileId: null,
         worldInfoBookId: null,
+        samplerPresetId: null,
       },
       skippedApply: [],
       warnings: [],
@@ -49,6 +51,7 @@ describe("bundle helpers", () => {
         worldInfoBooks: [],
         entityProfiles: [],
         uiThemePresets: [],
+        samplerPresets: [],
       },
       applied: {
         instructionId: null,
@@ -56,6 +59,7 @@ describe("bundle helpers", () => {
         uiThemePresetId: null,
         entityProfileId: null,
         worldInfoBookId: null,
+        samplerPresetId: null,
       },
       skippedApply: [
         {
@@ -76,6 +80,7 @@ describe("bundle helpers", () => {
       sourceInstruction: { id: "inst-1", name: "Main instruction" },
       activeOperationProfile: { profileId: "prof-1", name: "Main profile" },
       activeUiThemePreset: { presetId: "theme-1", name: "Night" },
+      activeSamplerPreset: { presetId: "sampler-1", name: "Storyteller" },
       currentEntityProfile: { id: "entity-1", name: "Hero" },
       currentWorldInfoBooks: [{ id: "book-1", name: "Lore" }],
     });
@@ -84,6 +89,7 @@ describe("bundle helpers", () => {
       expect.objectContaining({ key: "instruction:inst-1", checkedByDefault: true }),
       expect.objectContaining({ key: "operation_profile:prof-1", checkedByDefault: false }),
       expect.objectContaining({ key: "ui_theme_preset:theme-1", checkedByDefault: false }),
+      expect.objectContaining({ key: "sampler_preset:sampler-1", checkedByDefault: false }),
       expect.objectContaining({ key: "entity_profile:entity-1", checkedByDefault: false }),
       expect.objectContaining({ key: "world_info_book:book-1", checkedByDefault: false }),
     ]);
@@ -115,6 +121,12 @@ describe("bundle helpers", () => {
       handle: { kind: "operation_profile" as const, id: "prof-1" },
       checkedByDefault: false,
     };
+    const samplerCandidate = {
+      key: "sampler_preset:sampler-1",
+      label: "Storyteller",
+      handle: { kind: "sampler_preset" as const, id: "sampler-1" },
+      checkedByDefault: false,
+    };
 
     expect(getBundleExportCandidateCopy(sourceCandidate)).toEqual({
       kindLabelKey: "instructions.bundle.candidates.kinds.instruction",
@@ -124,5 +136,35 @@ describe("bundle helpers", () => {
       kindLabelKey: "instructions.bundle.candidates.kinds.operationProfile",
       descriptionKey: "instructions.bundle.candidates.descriptions.operationProfile",
     });
+    expect(getBundleExportCandidateCopy(samplerCandidate)).toEqual({
+      kindLabelKey: "instructions.bundle.candidates.kinds.samplerPreset",
+      descriptionKey: "instructions.bundle.candidates.descriptions.samplerPreset",
+    });
+  });
+
+  it("returns sampler preset auto-apply target", () => {
+    const resolved = resolveBundleAutoApplyTargets({
+      created: {
+        instructions: [],
+        operationBlocks: [],
+        operationProfiles: [],
+        worldInfoBooks: [],
+        entityProfiles: [],
+        uiThemePresets: [],
+        samplerPresets: [{ resourceId: "sampler_preset:main", presetId: "sampler-1", name: "Storyteller" }],
+      },
+      applied: {
+        instructionId: null,
+        operationProfileId: null,
+        uiThemePresetId: null,
+        entityProfileId: null,
+        worldInfoBookId: null,
+        samplerPresetId: "sampler-1",
+      },
+      skippedApply: [],
+      warnings: [],
+    });
+
+    expect(resolved.samplerPresetId).toBe("sampler-1");
   });
 });
diff --git a/web/src/features/sidebars/common/bundle-helpers.ts b/web/src/features/sidebars/common/bundle-helpers.ts
index 1f70f62e..fdb44c2b 100644
--- a/web/src/features/sidebars/common/bundle-helpers.ts
+++ b/web/src/features/sidebars/common/bundle-helpers.ts
@@ -4,6 +4,7 @@ export type BundleApplyTargets = {
   instructionId: string | null;
   operationProfileId: string | null;
   uiThemePresetId: string | null;
+  samplerPresetId: string | null;
   entityProfileId: string | null;
   worldInfoBookId: string | null;
   warnings: string[];
@@ -26,6 +27,7 @@ export function resolveBundleAutoApplyTargets(result: BundleImportResult): Bundl
     instructionId: result.applied.instructionId,
     operationProfileId: result.applied.operationProfileId,
     uiThemePresetId: result.applied.uiThemePresetId,
+    samplerPresetId: result.applied.samplerPresetId,
     entityProfileId: result.applied.entityProfileId,
     worldInfoBookId: result.applied.worldInfoBookId,
     warnings: [...result.warnings, ...result.skippedApply.map((item) => item.message)],
@@ -64,6 +66,13 @@ export function getBundleExportCandidateCopy(candidate: BundleExportCandidate):
     };
   }
 
+  if (candidate.handle.kind === "sampler_preset") {
+    return {
+      kindLabelKey: "instructions.bundle.candidates.kinds.samplerPreset",
+      descriptionKey: "instructions.bundle.candidates.descriptions.samplerPreset",
+    };
+  }
+
   if (candidate.handle.kind === "entity_profile") {
     return {
       kindLabelKey: "instructions.bundle.candidates.kinds.entityProfile",
@@ -81,6 +90,7 @@ export function resolveInstructionBundleExportCandidates(params: {
   sourceInstruction: { id: string; name: string };
   activeOperationProfile?: { profileId: string; name: string } | null;
   activeUiThemePreset?: { presetId: string; name: string } | null;
+  activeSamplerPreset?: { presetId: string; name: string } | null;
   currentEntityProfile?: { id: string; name: string } | null;
   currentWorldInfoBooks?: Array<{ id: string; name: string }>;
 }): BundleExportCandidate[] {
@@ -111,6 +121,15 @@ export function resolveInstructionBundleExportCandidates(params: {
     });
   }
 
+  if (params.activeSamplerPreset) {
+    candidates.push({
+      key: `sampler_preset:${params.activeSamplerPreset.presetId}`,
+      label: params.activeSamplerPreset.name,
+      handle: { kind: "sampler_preset", id: params.activeSamplerPreset.presetId },
+      checkedByDefault: false,
+    });
+  }
+
   if (params.currentEntityProfile) {
     candidates.push({
       key: `entity_profile:${params.currentEntityProfile.id}`,
diff --git a/web/src/features/sidebars/instructions/instruction-bundle-actions.tsx b/web/src/features/sidebars/instructions/instruction-bundle-actions.tsx
index 0fb99cf0..1639dd7d 100644
--- a/web/src/features/sidebars/instructions/instruction-bundle-actions.tsx
+++ b/web/src/features/sidebars/instructions/instruction-bundle-actions.tsx
@@ -8,6 +8,7 @@ import { $currentChat, $currentEntityProfile, $entityProfiles, loadEntityProfile
 import { instructionSelected, loadInstructionsFx } from "@model/instructions";
 import { loadOperationBlocksFx } from "@model/operation-blocks";
 import { $operationProfileSettings, $operationProfiles, loadActiveOperationProfileFx, loadOperationProfilesFx, setActiveOperationProfileRequested } from "@model/operation-profiles";
+import { samplersModel } from "@model/samplers";
 import { $activeUiThemePreset, loadUiThemePresetsFx, loadUiThemeSettingsFx, patchUiThemeSettingsFx } from "@model/ui-themes";
 import { $worldInfoBooks, $worldInfoChatBindings, loadWorldInfoBooksFx, worldInfoBookSelected } from "@model/world-info";
 import { IconButtonWithTooltip } from "@ui/icon-button-with-tooltip";
@@ -39,6 +40,8 @@ export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction
     operationProfiles,
     operationProfileSettings,
     activeUiThemePreset,
+    samplerPresets,
+    samplerSettings,
     worldInfoBooks,
     worldInfoChatBindings,
   ] = useUnit([
@@ -48,6 +51,8 @@ export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction
     $operationProfiles,
     $operationProfileSettings,
     $activeUiThemePreset,
+    samplersModel.$items,
+    samplersModel.$settings,
     $worldInfoBooks,
     $worldInfoChatBindings,
   ]);
@@ -58,8 +63,11 @@ export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction
     refreshBlocks,
     refreshThemes,
     refreshThemeSettings,
+    refreshSamplers,
+    refreshSamplerSettings,
     refreshEntities,
     refreshWorldInfo,
+    applySamplerPreset,
     applyEntityProfile,
     applyWorldInfoBook,
     applyOperationProfile,
@@ -71,8 +79,11 @@ export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction
     loadOperationBlocksFx,
     loadUiThemePresetsFx,
     loadUiThemeSettingsFx,
+    samplersModel.getItemsFx,
+    samplersModel.getSettingsFx,
     loadEntityProfilesFx,
     loadWorldInfoBooksFx,
+    samplersModel.updateSettingsFx,
     selectEntityProfile,
     worldInfoBookSelected,
     setActiveOperationProfileRequested,
@@ -83,6 +94,10 @@ export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction
     const activeId = operationProfileSettings?.activeProfileId ?? null;
     return operationProfiles.find((item) => item.profileId === activeId) ?? null;
   }, [operationProfileSettings?.activeProfileId, operationProfiles]);
+  const activeSamplerPreset = useMemo(() => {
+    const activeId = samplerSettings?.selectedId ?? null;
+    return samplerPresets.find((item) => item.id === activeId) ?? null;
+  }, [samplerPresets, samplerSettings?.selectedId]);
 
   const currentWorldInfoBooks = useMemo(() => {
     const enabledIds = new Set(
@@ -103,12 +118,13 @@ export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction
       activeUiThemePreset: activeUiThemePreset
         ? { presetId: activeUiThemePreset.presetId, name: activeUiThemePreset.name }
         : null,
+      activeSamplerPreset: activeSamplerPreset ? { presetId: activeSamplerPreset.id, name: activeSamplerPreset.name } : null,
       currentEntityProfile: currentEntityProfile
         ? { id: currentEntityProfile.id, name: currentEntityProfile.name }
         : null,
       currentWorldInfoBooks,
     });
-  }, [activeOperationProfile, activeUiThemePreset, currentEntityProfile, currentWorldInfoBooks, selectedInstruction]);
+  }, [activeOperationProfile, activeSamplerPreset, activeUiThemePreset, currentEntityProfile, currentWorldInfoBooks, selectedInstruction]);
 
   useEffect(() => {
     if (!opened) return;
@@ -140,13 +156,15 @@ export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction
   const handleBundleImport = async (file: File | null) => {
     if (!file) return;
     const imported = await importBundle(file);
-    const [, , , , , , reloadedEntities] = await Promise.all([
+    const [, , , , , , , , reloadedEntities] = await Promise.all([
       refreshInstructions(),
       refreshProfiles(),
       refreshProfileSettings(),
       refreshBlocks(),
       refreshThemes(),
       refreshThemeSettings(),
+      refreshSamplers(),
+      refreshSamplerSettings(),
       refreshEntities(),
       refreshWorldInfo(),
     ]);
@@ -165,6 +183,9 @@ export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction
     if (applyTargets.uiThemePresetId) {
       await applyThemePreset({ activePresetId: applyTargets.uiThemePresetId });
     }
+    if (applyTargets.samplerPresetId) {
+      await applySamplerPreset({ selectedId: applyTargets.samplerPresetId });
+    }
     if (applyTargets.entityProfileId) {
       const profile = (reloadedEntities ?? entityProfiles).find((item) => item.id === applyTargets.entityProfileId);
       if (profile) {
@@ -185,6 +206,7 @@ export const InstructionBundleActions: React.FC<Props> = ({ selectedInstruction
       imported.created.operationProfiles.length +
       imported.created.entityProfiles.length +
       imported.created.uiThemePresets.length +
+      imported.created.samplerPresets.length +
       imported.created.worldInfoBooks.length;
     toaster.success({
       title: t("instructions.bundle.toasts.importSuccessTitle"),
diff --git a/web/src/features/sidebars/settings/preset-controls.tsx b/web/src/features/sidebars/settings/preset-controls.tsx
index a853592a..715b1de5 100644
--- a/web/src/features/sidebars/settings/preset-controls.tsx
+++ b/web/src/features/sidebars/settings/preset-controls.tsx
@@ -3,6 +3,8 @@ import { LuCopy, LuPencil, LuPlus, LuSave, LuTrash2 } from 'react-icons/lu';
 
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 
+import type { ReactNode } from 'react';
+
 type PresetOption = {
 	value: string;
 	label: string;
@@ -18,6 +20,8 @@ type PresetControlsLabels = {
 	delete: string;
 };
 
+type PresetControlsLayout = 'inline' | 'stacked';
+
 type Props = {
 	labels: PresetControlsLabels;
 	options: PresetOption[];
@@ -32,6 +36,8 @@ type Props = {
 	disableDuplicate?: boolean;
 	disableSave?: boolean;
 	disableDelete?: boolean;
+	layout?: PresetControlsLayout;
+	extraActions?: ReactNode;
 };
 
 export const PresetControls: React.FC<Props> = ({
@@ -48,41 +54,66 @@ export const PresetControls: React.FC<Props> = ({
 	disableDuplicate = false,
 	disableSave = false,
 	disableDelete = false,
+	layout = 'inline',
+	extraActions,
 }) => {
+	const actionButtons = (
+		<>
+			<IconButtonWithTooltip icon={<LuPlus />} tooltip={labels.create} aria-label={labels.create} onClick={onCreate} />
+			<IconButtonWithTooltip icon={<LuPencil />} tooltip={labels.rename} aria-label={labels.rename} onClick={onRename} disabled={disableRename} />
+			<IconButtonWithTooltip
+				icon={<LuCopy />}
+				tooltip={labels.duplicate}
+				aria-label={labels.duplicate}
+				onClick={onDuplicate}
+				disabled={disableDuplicate}
+			/>
+			{extraActions}
+			<IconButtonWithTooltip
+				icon={<LuSave />}
+				tooltip={labels.save}
+				aria-label={labels.save}
+				onClick={onSave}
+				disabled={disableSave}
+				variant="solid"
+			/>
+			<IconButtonWithTooltip icon={<LuTrash2 />} tooltip={labels.delete} aria-label={labels.delete} onClick={onDelete} disabled={disableDelete} />
+		</>
+	);
+
 	return (
 		<Stack gap="xs">
 			<Text fw={600}>{labels.title}</Text>
-			<Group align="flex-end">
-				<Select
-					style={{ flex: 1 }}
-					label={labels.active}
-					data={options}
-					value={value}
-					onChange={(nextValue) => onChange(nextValue ?? null)}
-					allowDeselect={false}
-					comboboxProps={{ withinPortal: false }}
-				/>
-				<Group gap="xs" pb={4}>
-					<IconButtonWithTooltip icon={<LuPlus />} tooltip={labels.create} aria-label={labels.create} onClick={onCreate} />
-					<IconButtonWithTooltip icon={<LuPencil />} tooltip={labels.rename} aria-label={labels.rename} onClick={onRename} disabled={disableRename} />
-					<IconButtonWithTooltip
-						icon={<LuCopy />}
-						tooltip={labels.duplicate}
-						aria-label={labels.duplicate}
-						onClick={onDuplicate}
-						disabled={disableDuplicate}
+			{layout === 'stacked' ? (
+				<>
+					<Select
+						label={labels.active}
+						data={options}
+						value={value}
+						onChange={(nextValue) => onChange(nextValue ?? null)}
+						allowDeselect={false}
+						comboboxProps={{ withinPortal: false }}
 					/>
-					<IconButtonWithTooltip
-						icon={<LuSave />}
-						tooltip={labels.save}
-						aria-label={labels.save}
-						onClick={onSave}
-						disabled={disableSave}
-						variant="solid"
+					<Group gap="xs" justify="flex-end">
+						{actionButtons}
+					</Group>
+				</>
+			) : (
+				<Group align="flex-end">
+					<Select
+						style={{ flex: 1 }}
+						label={labels.active}
+						data={options}
+						value={value}
+						onChange={(nextValue) => onChange(nextValue ?? null)}
+						allowDeselect={false}
+						comboboxProps={{ withinPortal: false }}
 					/>
-					<IconButtonWithTooltip icon={<LuTrash2 />} tooltip={labels.delete} aria-label={labels.delete} onClick={onDelete} disabled={disableDelete} />
+					<Group gap="xs" pb={4}>
+						{actionButtons}
+					</Group>
 				</Group>
-			</Group>
+			)}
 		</Stack>
 	);
 };
diff --git a/web/src/features/sidebars/settings/settings-tab.tsx b/web/src/features/sidebars/settings/settings-tab.tsx
index 00282317..93c63f4b 100644
--- a/web/src/features/sidebars/settings/settings-tab.tsx
+++ b/web/src/features/sidebars/settings/settings-tab.tsx
@@ -1,14 +1,19 @@
 import { Stack } from '@mantine/core';
 import { type SamplerItemSettingsType, type SamplersItemType } from '@shared/types/samplers';
 import { useUnit } from 'effector-react';
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useRef } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
 import { createEmptySampler, samplersModel } from '@model/samplers';
+import { IMPORT_FILE_ICON, EXPORT_FILE_ICON } from '@ui/file-transfer-icons';
+import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
+import { toaster } from '@ui/toaster';
 
+import { downloadBlobFile, exportBundle, importBundle } from '../../../api/bundles';
 import { getLlmSettingsFields } from '../../../model/llm-settings';
 import { SamplerSettingsGrid } from '../../llm-provider/sampler-settings-grid';
+import { resolveBundleAutoApplyTargets } from '../common/bundle-helpers';
 
 import { PresetControls } from './preset-controls';
 
@@ -23,12 +28,18 @@ function hasDirtyFields(value: unknown): boolean {
 
 export const SamplerSettingsTab: React.FC = () => {
 	const { t } = useTranslation();
-	const settings = useUnit(samplersModel.$settings);
-	const items = useUnit(samplersModel.$items);
-	const selectedItem = useMemo(
-		() => items.find((item) => item.id === settings.selectedId) ?? null,
-		[items, settings.selectedId],
-	);
+	const fileInputRef = useRef<HTMLInputElement>(null);
+	const [settings, items, loadItems, loadSettings, updateSettings, createItem, updateItem, deleteItem] = useUnit([
+		samplersModel.$settings,
+		samplersModel.$items,
+		samplersModel.getItemsFx,
+		samplersModel.getSettingsFx,
+		samplersModel.updateSettingsFx,
+		samplersModel.createItemFx,
+		samplersModel.updateItemFx,
+		samplersModel.deleteItemFx,
+	]);
+	const selectedItem = useMemo(() => items.find((item) => item.id === settings?.selectedId) ?? null, [items, settings?.selectedId]);
 	const llmSettingsFields = getLlmSettingsFields(t);
 
 	const methods = useForm<SamplerItemSettingsType>({
@@ -44,8 +55,7 @@ export const SamplerSettingsTab: React.FC = () => {
 	const handleSave = () => {
 		if (!selectedItem) return;
 		const newItem = { ...selectedItem, settings: getValues() } as SamplersItemType;
-
-		samplersModel.updateItemFx(newItem);
+		void updateItem(newItem);
 	};
 
 	const askValue = (prompt: string, defaultValue: string): string | null => {
@@ -56,7 +66,7 @@ export const SamplerSettingsTab: React.FC = () => {
 	const handleCreate = () => {
 		const name = askValue(t('llmSettings.actions.createPrompt'), t('llmSettings.defaults.newPresetName'));
 		if (!name) return;
-		samplersModel.createItemFx({
+		void createItem({
 			...createEmptySampler(getValues()),
 			name,
 		});
@@ -68,19 +78,19 @@ export const SamplerSettingsTab: React.FC = () => {
 		if (hasUnsavedChanges && !window.confirm(t('llmSettings.confirm.discardChanges'))) {
 			return;
 		}
-		samplersModel.updateSettingsFx({ ...(settings ?? {}), selectedId: selectedId ?? null });
+		void updateSettings({ selectedId: selectedId ?? null });
 	};
 
 	const handleRename = () => {
 		if (!selectedItem) return;
 		const name = window.prompt(t('llmSettings.actions.renamePrompt'), selectedItem.name)?.trim();
 		if (!name) return;
-		samplersModel.updateItemFx({ ...selectedItem, name });
+		void updateItem({ ...selectedItem, name });
 	};
 
 	const handleDuplicate = () => {
 		if (!selectedItem) return;
-		samplersModel.createItemFx({
+		void createItem({
 			...createEmptySampler(getValues()),
 			name: `${selectedItem.name} copy`,
 		});
@@ -89,7 +99,52 @@ export const SamplerSettingsTab: React.FC = () => {
 	const handleDelete = () => {
 		if (!selectedItem) return;
 		if (!window.confirm(t('llmSettings.confirm.delete'))) return;
-		samplersModel.deleteItemFx({ id: selectedItem.id, skipConfirm: true });
+		void deleteItem({ id: selectedItem.id, skipConfirm: true });
+	};
+
+	const handleExport = async () => {
+		if (!selectedItem) return;
+		try {
+			const exported = await exportBundle({
+				source: { kind: 'sampler_preset', id: selectedItem.id },
+				selections: [{ kind: 'sampler_preset', id: selectedItem.id }],
+				format: 'auto',
+			});
+			downloadBlobFile(exported.filename, exported.blob);
+			toaster.success({ title: t('llmSettings.toasts.exportDone'), description: selectedItem.name });
+		} catch (error) {
+			toaster.error({
+				title: t('llmSettings.toasts.exportFailed'),
+				description: error instanceof Error ? error.message : String(error),
+			});
+		}
+	};
+
+	const handleImport = async (file: File | null) => {
+		if (!file) return;
+		try {
+			const imported = await importBundle(file);
+			await Promise.all([loadItems(), loadSettings()]);
+			const applyTargets = resolveBundleAutoApplyTargets(imported);
+			if (applyTargets.samplerPresetId) {
+				await updateSettings({ selectedId: applyTargets.samplerPresetId });
+			}
+			if (applyTargets.warnings.length > 0) {
+				toaster.warning({
+					title: t('llmSettings.toasts.importWarning'),
+					description: applyTargets.warnings.join(' '),
+				});
+			}
+			toaster.success({
+				title: t('llmSettings.toasts.importDone'),
+				description: t('llmSettings.toasts.importedCount', { count: imported.created.samplerPresets.length }),
+			});
+		} catch (error) {
+			toaster.error({
+				title: t('llmSettings.toasts.importFailed'),
+				description: error instanceof Error ? error.message : String(error),
+			});
+		}
 	};
 
 	const options = items
@@ -101,6 +156,18 @@ export const SamplerSettingsTab: React.FC = () => {
 
 	return (
 		<Stack gap="md">
+			<input
+				ref={fileInputRef}
+				type="file"
+				accept=".json,.tsbundle"
+				style={{ display: 'none' }}
+				onChange={(event) => {
+					const file = event.currentTarget.files?.[0] ?? null;
+					void handleImport(file).finally(() => {
+						event.currentTarget.value = '';
+					});
+				}}
+			/>
 			<PresetControls
 				labels={{
 					title: t('llmSettings.presets.title'),
@@ -123,8 +190,25 @@ export const SamplerSettingsTab: React.FC = () => {
 				disableDuplicate={!selectedItem}
 				disableSave={!selectedItem || !hasUnsavedChanges}
 				disableDelete={!selectedItem}
+				layout="stacked"
+				extraActions={
+					<>
+						<IconButtonWithTooltip
+							icon={<IMPORT_FILE_ICON />}
+							tooltip={t('llmSettings.actions.import')}
+							aria-label={t('llmSettings.actions.import')}
+							onClick={() => fileInputRef.current?.click()}
+						/>
+						<IconButtonWithTooltip
+							icon={<EXPORT_FILE_ICON />}
+							tooltip={t('llmSettings.actions.export')}
+							aria-label={t('llmSettings.actions.export')}
+							onClick={() => void handleExport()}
+							disabled={!selectedItem}
+						/>
+					</>
+				}
 			/>
-
 			<FormProvider {...methods}>
 				<SamplerSettingsGrid control={control} fields={llmSettingsFields} columns={1} />
 			</FormProvider>
diff --git a/web/src/i18n/resources/en/instructions.ts b/web/src/i18n/resources/en/instructions.ts
index 5684b59d..de30dc84 100644
--- a/web/src/i18n/resources/en/instructions.ts
+++ b/web/src/i18n/resources/en/instructions.ts
@@ -107,6 +107,7 @@ const enInstructions = {
 				instruction: 'Instruction',
 				operationProfile: 'Operation profile',
 				uiThemePreset: 'UI theme preset',
+				samplerPreset: 'LLM preset',
 				entityProfile: 'Entity profile',
 				worldInfoBook: 'World info book',
 			},
@@ -115,6 +116,7 @@ const enInstructions = {
 				instruction: 'Instruction. Imported as a new instruction preset.',
 				operationProfile: 'Active operation profile. Its related enabled operation blocks will be exported with it.',
 				uiThemePreset: 'Active UI theme preset. It can be applied immediately after import.',
+				samplerPreset: 'Active LLM preset. It can be applied immediately after import.',
 				entityProfile: 'Current entity profile. Its avatar is included as well when present.',
 				worldInfoBook: 'Active world info book from the current chat. Imported as a separate book.',
 			},
diff --git a/web/src/i18n/resources/en/llmSettings.ts b/web/src/i18n/resources/en/llmSettings.ts
index a30c94bf..6a2c60d0 100644
--- a/web/src/i18n/resources/en/llmSettings.ts
+++ b/web/src/i18n/resources/en/llmSettings.ts
@@ -14,12 +14,22 @@ const enLlmSettings = {
 		rename: 'Rename',
 		renamePrompt: 'Enter new preset name',
 		duplicate: 'Duplicate',
+		import: 'Import',
+		export: 'Export',
 		delete: 'Delete',
 	},
 	confirm: {
 		delete: 'Delete selected preset?',
 		discardChanges: 'You have unsaved changes. Discard them and switch preset?',
 	},
+	toasts: {
+		exportDone: 'Preset exported',
+		exportFailed: 'Failed to export preset',
+		importDone: 'Presets imported',
+		importFailed: 'Failed to import presets',
+		importWarning: 'Import completed with warnings',
+		importedCount: 'Imported presets: {{count}}',
+	},
 	fields: {
 		maxTokens: {
 			label: 'Max Tokens',
diff --git a/web/src/i18n/resources/ru/instructions.ts b/web/src/i18n/resources/ru/instructions.ts
index 76400e38..0bcbe61a 100644
--- a/web/src/i18n/resources/ru/instructions.ts
+++ b/web/src/i18n/resources/ru/instructions.ts
@@ -107,6 +107,7 @@ const ruInstructions = {
 				instruction: 'Инструкция',
 				operationProfile: 'Профиль операций',
 				uiThemePreset: 'Тема интерфейса',
+				samplerPreset: 'LLM пресет',
 				entityProfile: 'Профиль сущности',
 				worldInfoBook: 'Книга мира',
 			},
@@ -115,6 +116,7 @@ const ruInstructions = {
 				instruction: 'Инструкция. Импортируется как новый пресет инструкции.',
 				operationProfile: 'Активный профиль операций. Связанные включённые блоки операций будут экспортированы вместе с ним.',
 				uiThemePreset: 'Активный пресет темы интерфейса. После импорта его можно сразу применить.',
+				samplerPreset: 'Активный LLM пресет. После импорта его можно сразу применить.',
 				entityProfile: 'Текущий профиль сущности. Если у него есть аватар, он тоже войдёт в набор.',
 				worldInfoBook: 'Активная книга World Info из текущего чата. Импортируется как отдельная книга.',
 			},
diff --git a/web/src/i18n/resources/ru/llmSettings.ts b/web/src/i18n/resources/ru/llmSettings.ts
index 6e11e614..c0135161 100644
--- a/web/src/i18n/resources/ru/llmSettings.ts
+++ b/web/src/i18n/resources/ru/llmSettings.ts
@@ -14,12 +14,22 @@ const ruLlmSettings = {
 		rename: 'Переименовать',
 		renamePrompt: 'Введите новое название пресета',
 		duplicate: 'Дублировать',
+		import: 'Импортировать',
+		export: 'Экспортировать',
 		delete: 'Удалить',
 	},
 	confirm: {
 		delete: 'Удалить выбранный пресет?',
 		discardChanges: 'Есть несохранённые изменения. Отменить их и переключить пресет?',
 	},
+	toasts: {
+		exportDone: 'Пресет экспортирован',
+		exportFailed: 'Не удалось экспортировать пресет',
+		importDone: 'Пресеты импортированы',
+		importFailed: 'Не удалось импортировать пресеты',
+		importWarning: 'Импорт завершён с предупреждениями',
+		importedCount: 'Импортировано пресетов: {{count}}',
+	},
 	fields: {
 		maxTokens: {
 			label: 'Max Tokens',

From 5e4cdf83e9f7494719c004560df9ce0346cc66fb Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sun, 15 Mar 2026 18:10:45 +0300
Subject: [PATCH 18/54] fix: operation guard

---
 docs/docs/dev/backend/api-endpoints.md        |  84 +--
 .../current/dev/backend/api-endpoints.md      |  84 +--
 ...peration-implementation-spec-2026-03-15.md | 656 ++++++++++++++++++
 .../13-operation-kind-guard.md                | 524 ++++++++++++++
 .../pipelines-and-processing-spec-v2/map.md   |   1 +
 .../core/operation-orchestrator/executor.ts   |  35 +
 .../src/core/operation-orchestrator/index.ts  |   2 +-
 .../src/core/operation-orchestrator/skip.ts   |  19 +
 .../src/core/operation-orchestrator/types.ts  |   4 +-
 .../chat-core/prompt-template-context.ts      |  26 +
 .../chat-core/prompt-template-renderer.ts     |  15 +
 .../services/chat-generation-v3/contracts.ts  |   7 +
 .../execute-operations-phase.test.ts          | 319 +++++++++
 .../operations/execute-operations-phase.ts    |  89 ++-
 .../operations/guard-operation-executor.ts    | 148 ++++
 .../operations/guard-run-conditions.ts        |  66 ++
 .../operations/guard-operation-params.ts      | 133 ++++
 .../operations/guard-output-contract.ts       |  28 +
 .../operation-block-validator.test.ts         | 278 ++++++++
 .../operations/operation-block-validator.ts   | 172 ++++-
 .../operation-profile-resolver.test.ts        | 176 ++++-
 .../operations/operation-profile-resolver.ts  |   9 +
 shared/types/operation-profiles.ts            |  70 +-
 .../form/guard-kind-form.ts                   | 177 +++++
 .../form/operation-llm-form-utils.ts          |  36 +
 .../operation-profile-form-mapping.test.ts    | 238 +++++++
 .../form/operation-profile-form-mapping.ts    | 121 ++--
 .../node-editor/block-node-editor-modal.tsx   | 293 ++++----
 .../flow/operation-flow-node-model.test.ts    |  79 +++
 .../flow/operation-flow-node-model.ts         |  54 ++
 .../node-editor/flow/operation-flow-node.tsx  |  59 +-
 .../node-editor/operation-graph.test.ts       | 137 ++++
 .../node-editor/operation-graph.ts            | 243 +++++++
 .../operation-block-editor.tsx                |  13 +-
 .../ui/operation-editor/operation-editor.tsx  |  45 +-
 .../sections/execution-section.tsx            | 121 +++-
 .../kind-params/guard-kind-section.tsx        | 186 +++++
 .../sections/output-section.tsx               |  19 +-
 .../sections/params-section.tsx               |   3 +
 .../operation-profiles/ui/operation-list.tsx  |  21 +-
 .../ui/operation-row-container.tsx            |  14 +-
 .../utils/operation-kind.ts                   |  25 +
 .../i18n/resources/en/operationProfiles.ts    |  43 +-
 .../i18n/resources/ru/operationProfiles.ts    |  43 +-
 44 files changed, 4525 insertions(+), 390 deletions(-)
 create mode 100644 knowledge-base/guard-operation-implementation-spec-2026-03-15.md
 create mode 100644 knowledge-base/pipelines-and-processing-spec-v2/13-operation-kind-guard.md
 create mode 100644 server/src/core/operation-orchestrator/skip.ts
 create mode 100644 server/src/services/chat-generation-v3/operations/guard-operation-executor.ts
 create mode 100644 server/src/services/chat-generation-v3/operations/guard-run-conditions.ts
 create mode 100644 server/src/services/operations/guard-operation-params.ts
 create mode 100644 server/src/services/operations/guard-output-contract.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/form/guard-kind-form.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/guard-kind-section.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/utils/operation-kind.ts

diff --git a/docs/docs/dev/backend/api-endpoints.md b/docs/docs/dev/backend/api-endpoints.md
index 3cd15711..826b0ab1 100644
--- a/docs/docs/dev/backend/api-endpoints.md
+++ b/docs/docs/dev/backend/api-endpoints.md
@@ -18,6 +18,8 @@ description: Автогенерируемый инвентарь backend endpoin
 | Method | Path | Source file | Handler section |
 | --- | --- | --- | --- |
 | USE | /api/app-settings | `server/src/api/app-settings.api.ts` | L7 |
+| POST | /api/bundles/export | `server/src/api/bundles.core.api.ts` | L46 |
+| POST | /api/bundles/import | `server/src/api/bundles.core.api.ts` | L69 |
 | DELETE | /api/chats/:id | `server/src/api/chats.core.api.ts` | L91 |
 | GET | /api/chats/:id | `server/src/api/chats.core.api.ts` | L29 |
 | PUT | /api/chats/:id | `server/src/api/chats.core.api.ts` | L76 |
@@ -32,7 +34,7 @@ description: Автогенерируемый инвентарь backend endpoin
 | PUT | /api/chats/:id/instruction | `server/src/api/chats.core.api.ts` | L44 |
 | GET | /api/chats/:id/operation-runtime-state | `server/src/api/chat-entries.api.ts` | L335 |
 | GET | /api/chats/:id/world-info/latest-activations | `server/src/api/chat-entries.api.ts` | L350 |
-| ALL | /api/config/openrouter | `server/src/api/llm.api.ts` | L260 |
+| ALL | /api/config/openrouter | `server/src/api/llm.api.ts` | L257 |
 | GET | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L142 |
 | POST | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L150 |
 | DELETE | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L258 |
@@ -70,33 +72,33 @@ description: Автогенерируемый инвентарь backend endpoin
 | DELETE | /api/llm-presets/:id | `server/src/api/llm-presets.api.ts` | L132 |
 | PUT | /api/llm-presets/:id | `server/src/api/llm-presets.api.ts` | L108 |
 | POST | /api/llm-presets/:id/apply | `server/src/api/llm-presets.api.ts` | L150 |
-| GET | /api/llm/models | `server/src/api/llm.api.ts` | L219 |
-| GET | /api/llm/providers | `server/src/api/llm.api.ts` | L56 |
-| POST | /api/llm/providers/:providerId/check | `server/src/api/llm.api.ts` | L135 |
-| GET | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L106 |
-| PATCH | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L116 |
-| GET | /api/llm/runtime | `server/src/api/llm.api.ts` | L71 |
-| PATCH | /api/llm/runtime | `server/src/api/llm.api.ts` | L89 |
-| GET | /api/llm/tokens | `server/src/api/llm.api.ts` | L157 |
-| POST | /api/llm/tokens | `server/src/api/llm.api.ts` | L175 |
-| DELETE | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L210 |
-| PATCH | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L196 |
-| GET | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L37 |
-| POST | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L45 |
-| DELETE | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L83 |
-| GET | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L57 |
-| PUT | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L68 |
-| GET | /api/operation-blocks/:id/export | `server/src/api/operation-blocks.core.api.ts` | L97 |
-| POST | /api/operation-blocks/import | `server/src/api/operation-blocks.core.api.ts` | L122 |
-| GET | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L56 |
-| POST | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L64 |
-| DELETE | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L127 |
-| GET | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L101 |
-| PUT | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L112 |
-| GET | /api/operation-profiles/:id/export | `server/src/api/operation-profiles.core.api.ts` | L141 |
-| GET | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L78 |
-| PUT | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L90 |
-| POST | /api/operation-profiles/import | `server/src/api/operation-profiles.core.api.ts` | L155 |
+| GET | /api/llm/models | `server/src/api/llm.api.ts` | L216 |
+| GET | /api/llm/providers | `server/src/api/llm.api.ts` | L53 |
+| POST | /api/llm/providers/:providerId/check | `server/src/api/llm.api.ts` | L132 |
+| GET | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L103 |
+| PATCH | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L113 |
+| GET | /api/llm/runtime | `server/src/api/llm.api.ts` | L68 |
+| PATCH | /api/llm/runtime | `server/src/api/llm.api.ts` | L86 |
+| GET | /api/llm/tokens | `server/src/api/llm.api.ts` | L154 |
+| POST | /api/llm/tokens | `server/src/api/llm.api.ts` | L172 |
+| DELETE | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L207 |
+| PATCH | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L193 |
+| GET | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L33 |
+| POST | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L41 |
+| DELETE | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L79 |
+| GET | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L53 |
+| PUT | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L64 |
+| GET | /api/operation-blocks/:id/export | `server/src/api/operation-blocks.core.api.ts` | L93 |
+| POST | /api/operation-blocks/import | `server/src/api/operation-blocks.core.api.ts` | L118 |
+| GET | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L36 |
+| POST | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L44 |
+| DELETE | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L107 |
+| GET | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L81 |
+| PUT | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L92 |
+| GET | /api/operation-profiles/:id/export | `server/src/api/operation-profiles.core.api.ts` | L121 |
+| GET | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L58 |
+| PUT | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L70 |
+| POST | /api/operation-profiles/import | `server/src/api/operation-profiles.core.api.ts` | L135 |
 | POST | /api/parts/:id/canonicalization-undo | `server/src/api/chat-entries.api.ts` | L530 |
 | POST | /api/parts/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L545 |
 | GET | /api/rag/chroma/collections | `server/src/api/rag-chroma.api.ts` | L77 |
@@ -139,19 +141,19 @@ description: Автогенерируемый инвентарь backend endpoin
 | DELETE | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L93 |
 | GET | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L39 |
 | PUT | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L72 |
-| GET | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L346 |
-| PUT | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L360 |
-| GET | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L170 |
-| POST | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L180 |
-| DELETE | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L229 |
-| GET | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L191 |
-| PUT | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L202 |
-| POST | /api/world-info/books/:id/duplicate | `server/src/api/world-info.core.api.ts` | L240 |
-| GET | /api/world-info/books/:id/export | `server/src/api/world-info.core.api.ts` | L306 |
-| POST | /api/world-info/books/import | `server/src/api/world-info.core.api.ts` | L257 |
-| POST | /api/world-info/resolve | `server/src/api/world-info.core.api.ts` | L377 |
-| GET | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L325 |
-| PUT | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L335 |
+| GET | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L341 |
+| PUT | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L355 |
+| GET | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L165 |
+| POST | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L175 |
+| DELETE | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L224 |
+| GET | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L186 |
+| PUT | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L197 |
+| POST | /api/world-info/books/:id/duplicate | `server/src/api/world-info.core.api.ts` | L235 |
+| GET | /api/world-info/books/:id/export | `server/src/api/world-info.core.api.ts` | L301 |
+| POST | /api/world-info/books/import | `server/src/api/world-info.core.api.ts` | L252 |
+| POST | /api/world-info/resolve | `server/src/api/world-info.core.api.ts` | L372 |
+| GET | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L320 |
+| PUT | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L330 |
 | USE | /media | `server/src/api/static.api.ts` | L21 |
 
 ## Notes
diff --git a/docs/i18n/en/docusaurus-plugin-content-docs/current/dev/backend/api-endpoints.md b/docs/i18n/en/docusaurus-plugin-content-docs/current/dev/backend/api-endpoints.md
index b12df72e..e91da75e 100644
--- a/docs/i18n/en/docusaurus-plugin-content-docs/current/dev/backend/api-endpoints.md
+++ b/docs/i18n/en/docusaurus-plugin-content-docs/current/dev/backend/api-endpoints.md
@@ -18,6 +18,8 @@ Sources:
 | Method | Path | Source file | Handler section |
 | --- | --- | --- | --- |
 | USE | /api/app-settings | `server/src/api/app-settings.api.ts` | L7 |
+| POST | /api/bundles/export | `server/src/api/bundles.core.api.ts` | L46 |
+| POST | /api/bundles/import | `server/src/api/bundles.core.api.ts` | L69 |
 | DELETE | /api/chats/:id | `server/src/api/chats.core.api.ts` | L91 |
 | GET | /api/chats/:id | `server/src/api/chats.core.api.ts` | L29 |
 | PUT | /api/chats/:id | `server/src/api/chats.core.api.ts` | L76 |
@@ -32,7 +34,7 @@ Sources:
 | PUT | /api/chats/:id/instruction | `server/src/api/chats.core.api.ts` | L44 |
 | GET | /api/chats/:id/operation-runtime-state | `server/src/api/chat-entries.api.ts` | L335 |
 | GET | /api/chats/:id/world-info/latest-activations | `server/src/api/chat-entries.api.ts` | L350 |
-| ALL | /api/config/openrouter | `server/src/api/llm.api.ts` | L260 |
+| ALL | /api/config/openrouter | `server/src/api/llm.api.ts` | L257 |
 | GET | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L142 |
 | POST | /api/entity-profiles | `server/src/api/entity-profiles.core.api.ts` | L150 |
 | DELETE | /api/entity-profiles/:id | `server/src/api/entity-profiles.core.api.ts` | L258 |
@@ -70,33 +72,33 @@ Sources:
 | DELETE | /api/llm-presets/:id | `server/src/api/llm-presets.api.ts` | L132 |
 | PUT | /api/llm-presets/:id | `server/src/api/llm-presets.api.ts` | L108 |
 | POST | /api/llm-presets/:id/apply | `server/src/api/llm-presets.api.ts` | L150 |
-| GET | /api/llm/models | `server/src/api/llm.api.ts` | L219 |
-| GET | /api/llm/providers | `server/src/api/llm.api.ts` | L56 |
-| POST | /api/llm/providers/:providerId/check | `server/src/api/llm.api.ts` | L135 |
-| GET | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L106 |
-| PATCH | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L116 |
-| GET | /api/llm/runtime | `server/src/api/llm.api.ts` | L71 |
-| PATCH | /api/llm/runtime | `server/src/api/llm.api.ts` | L89 |
-| GET | /api/llm/tokens | `server/src/api/llm.api.ts` | L157 |
-| POST | /api/llm/tokens | `server/src/api/llm.api.ts` | L175 |
-| DELETE | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L210 |
-| PATCH | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L196 |
-| GET | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L37 |
-| POST | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L45 |
-| DELETE | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L83 |
-| GET | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L57 |
-| PUT | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L68 |
-| GET | /api/operation-blocks/:id/export | `server/src/api/operation-blocks.core.api.ts` | L97 |
-| POST | /api/operation-blocks/import | `server/src/api/operation-blocks.core.api.ts` | L122 |
-| GET | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L56 |
-| POST | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L64 |
-| DELETE | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L127 |
-| GET | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L101 |
-| PUT | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L112 |
-| GET | /api/operation-profiles/:id/export | `server/src/api/operation-profiles.core.api.ts` | L141 |
-| GET | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L78 |
-| PUT | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L90 |
-| POST | /api/operation-profiles/import | `server/src/api/operation-profiles.core.api.ts` | L155 |
+| GET | /api/llm/models | `server/src/api/llm.api.ts` | L216 |
+| GET | /api/llm/providers | `server/src/api/llm.api.ts` | L53 |
+| POST | /api/llm/providers/:providerId/check | `server/src/api/llm.api.ts` | L132 |
+| GET | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L103 |
+| PATCH | /api/llm/providers/:providerId/config | `server/src/api/llm.api.ts` | L113 |
+| GET | /api/llm/runtime | `server/src/api/llm.api.ts` | L68 |
+| PATCH | /api/llm/runtime | `server/src/api/llm.api.ts` | L86 |
+| GET | /api/llm/tokens | `server/src/api/llm.api.ts` | L154 |
+| POST | /api/llm/tokens | `server/src/api/llm.api.ts` | L172 |
+| DELETE | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L207 |
+| PATCH | /api/llm/tokens/:id | `server/src/api/llm.api.ts` | L193 |
+| GET | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L33 |
+| POST | /api/operation-blocks | `server/src/api/operation-blocks.core.api.ts` | L41 |
+| DELETE | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L79 |
+| GET | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L53 |
+| PUT | /api/operation-blocks/:id | `server/src/api/operation-blocks.core.api.ts` | L64 |
+| GET | /api/operation-blocks/:id/export | `server/src/api/operation-blocks.core.api.ts` | L93 |
+| POST | /api/operation-blocks/import | `server/src/api/operation-blocks.core.api.ts` | L118 |
+| GET | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L36 |
+| POST | /api/operation-profiles | `server/src/api/operation-profiles.core.api.ts` | L44 |
+| DELETE | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L107 |
+| GET | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L81 |
+| PUT | /api/operation-profiles/:id | `server/src/api/operation-profiles.core.api.ts` | L92 |
+| GET | /api/operation-profiles/:id/export | `server/src/api/operation-profiles.core.api.ts` | L121 |
+| GET | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L58 |
+| PUT | /api/operation-profiles/active | `server/src/api/operation-profiles.core.api.ts` | L70 |
+| POST | /api/operation-profiles/import | `server/src/api/operation-profiles.core.api.ts` | L135 |
 | POST | /api/parts/:id/canonicalization-undo | `server/src/api/chat-entries.api.ts` | L530 |
 | POST | /api/parts/:id/soft-delete | `server/src/api/chat-entries.api.ts` | L545 |
 | GET | /api/rag/chroma/collections | `server/src/api/rag-chroma.api.ts` | L77 |
@@ -139,19 +141,19 @@ Sources:
 | DELETE | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L93 |
 | GET | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L39 |
 | PUT | /api/user-persons/:id | `server/src/api/user-persons.core.api.ts` | L72 |
-| GET | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L346 |
-| PUT | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L360 |
-| GET | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L170 |
-| POST | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L180 |
-| DELETE | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L229 |
-| GET | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L191 |
-| PUT | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L202 |
-| POST | /api/world-info/books/:id/duplicate | `server/src/api/world-info.core.api.ts` | L240 |
-| GET | /api/world-info/books/:id/export | `server/src/api/world-info.core.api.ts` | L306 |
-| POST | /api/world-info/books/import | `server/src/api/world-info.core.api.ts` | L257 |
-| POST | /api/world-info/resolve | `server/src/api/world-info.core.api.ts` | L377 |
-| GET | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L325 |
-| PUT | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L335 |
+| GET | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L341 |
+| PUT | /api/world-info/bindings | `server/src/api/world-info.core.api.ts` | L355 |
+| GET | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L165 |
+| POST | /api/world-info/books | `server/src/api/world-info.core.api.ts` | L175 |
+| DELETE | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L224 |
+| GET | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L186 |
+| PUT | /api/world-info/books/:id | `server/src/api/world-info.core.api.ts` | L197 |
+| POST | /api/world-info/books/:id/duplicate | `server/src/api/world-info.core.api.ts` | L235 |
+| GET | /api/world-info/books/:id/export | `server/src/api/world-info.core.api.ts` | L301 |
+| POST | /api/world-info/books/import | `server/src/api/world-info.core.api.ts` | L252 |
+| POST | /api/world-info/resolve | `server/src/api/world-info.core.api.ts` | L372 |
+| GET | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L320 |
+| PUT | /api/world-info/settings | `server/src/api/world-info.core.api.ts` | L330 |
 | USE | /media | `server/src/api/static.api.ts` | L21 |
 
 ## Notes
diff --git a/knowledge-base/guard-operation-implementation-spec-2026-03-15.md b/knowledge-base/guard-operation-implementation-spec-2026-03-15.md
new file mode 100644
index 00000000..31e0858a
--- /dev/null
+++ b/knowledge-base/guard-operation-implementation-spec-2026-03-15.md
@@ -0,0 +1,656 @@
+# Spec: План Внедрения Guard Operation
+
+_Дата: 2026-03-15_
+
+## 1) Цель
+
+Цель этого документа: зафиксировать полный рабочий план внедрения `kind="guard"` в текущую архитектуру TaleSpinner.
+
+Feature goal:
+
+- дать пользователю возможность вычислять структурированные boolean-флаги по контексту чата;
+- использовать эти флаги для ветвления исполнения других операций;
+- отобразить ветви guard в node-editor;
+- сохранить совместимость с текущей моделью `Operation -> artifact -> effects -> orchestrator`.
+
+## 2) Ключевое решение
+
+Guard не должен становиться отдельной магической подсистемой.
+
+Guard должен быть:
+
+- обычной операцией в профиле;
+- с новым `kind="guard"`;
+- с собственным typed output contract;
+- с одним JSON-артефактом на выходе;
+- с отдельным механизмом `runConditions` для downstream-ветвления.
+
+Важное архитектурное решение:
+
+- `dependsOn` отвечает за порядок исполнения;
+- `runConditions` отвечает за логическое ветвление;
+- `@core/operation-orchestrator` остаётся универсальным и не знает про guard-специфику;
+- guard-специфика реализуется в operation runtime-слое.
+
+## 3) Scope
+
+Входит в scope:
+
+- shared contracts для guard и `runConditions`;
+- save-time validation;
+- runtime support в chat-generation-v3;
+- поддержка `liquid` и `aux_llm` guard engine;
+- node-editor representation;
+- editor UX;
+- тесты;
+- внутренняя документация.
+
+Не входит в scope первого цикла:
+
+- nested guard outputs;
+- сложные логические выражения (`AND/OR groups`) между несколькими условиями;
+- arbitrary JSON-schema outputs вместо boolean map;
+- условные связи между разными hook phases без явных зависимостей;
+- отдельный DSL для правил.
+
+## 4) Target Contract
+
+### 4.1 Shared types
+
+Нужно расширить `shared/types/operation-profiles.ts`.
+
+Новые типы:
+
+```ts
+export type GuardEngine = "liquid" | "aux_llm";
+
+export type GuardRunOnError = "error" | "all_false";
+
+export type GuardOutputDefinition = {
+  key: string;
+  title: string;
+  description?: string;
+};
+
+export type GuardOutputContract = GuardOutputDefinition[];
+
+export type GuardLiquidParams = {
+  engine: "liquid";
+  outputContract: GuardOutputContract;
+  template: string;
+  strictVariables?: boolean;
+  runOnError?: GuardRunOnError;
+};
+
+export type GuardAuxLlmParams = {
+  engine: "aux_llm";
+  outputContract: GuardOutputContract;
+  system?: string;
+  prompt: string;
+  strictVariables?: boolean;
+  providerId: "openrouter" | "openai_compatible";
+  credentialRef: string;
+  model?: string;
+  timeoutMs?: number;
+  retry?: LlmOperationRetry;
+  samplers?: LlmOperationSamplers;
+  runOnError?: GuardRunOnError;
+};
+
+export type GuardOperationParams =
+  | (GuardLiquidParams & { artifact: OperationArtifactConfig })
+  | (GuardAuxLlmParams & { artifact: OperationArtifactConfig });
+
+export type OperationRunCondition =
+  | {
+      type: "guard_output";
+      sourceOpId: string;
+      outputKey: string;
+      operator: "is_true";
+    }
+  | {
+      type: "guard_output";
+      sourceOpId: string;
+      outputKey: string;
+      operator: "is_false";
+    };
+```
+
+Изменения существующих типов:
+
+```ts
+export type OperationKind =
+  | "template"
+  | "llm"
+  | "guard"
+  | "rag"
+  | "tool"
+  | "compute"
+  | "transform"
+  | "legacy";
+```
+
+```ts
+export type OperationConfig<TParams extends OperationParams = OperationParams> = {
+  enabled: boolean;
+  required: boolean;
+  hooks: OperationHook[];
+  triggers?: OperationTrigger[];
+  activation?: OperationActivationConfig;
+  order: number;
+  dependsOn?: string[];
+  runConditions?: OperationRunCondition[];
+  params: TParams;
+};
+```
+
+Примечание:
+
+- guard лучше описывать отдельным специализированным params-типом, а не generic `paramsJson`;
+- это упростит и backend validation, и frontend editor.
+
+### 4.2 Runtime result
+
+Runtime value guard-артефакта:
+
+```ts
+export type GuardOutputValue = Record<string, boolean>;
+```
+
+Новые runtime причины пропуска:
+
+```ts
+export type OperationSkipReason =
+  | "activation_not_reached"
+  | "dependency_not_done"
+  | "dependency_missing"
+  | "guard_not_matched"
+  | "unsupported_kind"
+  | "orchestrator_aborted"
+  | "filtered_out"
+  | "disabled";
+```
+
+Расширение `skipDetails`:
+
+```ts
+export type OperationSkipDetails = {
+  activation?: { ... };
+  blockedByOpIds?: string[];
+  blockedByReason?: "activation_not_reached";
+  guard?: {
+    sourceOpId: string;
+    outputKey: string;
+    operator: "is_true" | "is_false";
+    actual: boolean | null;
+  };
+};
+```
+
+## 5) Save-time Validation Plan
+
+Затрагиваемый код:
+
+- `server/src/services/operations/operation-block-validator.ts`
+- возможно `server/src/services/operations/operation-profile-validator.ts`
+
+Что нужно добавить:
+
+1. Распознавание `kind="guard"` в Zod-схеме.
+2. Новую Zod-схему для guard params.
+3. Валидацию `outputContract`.
+4. Валидацию `runConditions`.
+5. Валидацию совместимости hooks/dependencies.
+6. Валидацию artifact policy для guard.
+
+Правила:
+
+- `artifact.format === "json"` обязательно;
+- `outputContract.length >= 1`;
+- все `outputContract.key` уникальны;
+- `runConditions[].sourceOpId` существует;
+- `runConditions[].sourceOpId` ссылается на `kind="guard"`;
+- `runConditions[].outputKey` существует в source guard;
+- каждый `runCondition.sourceOpId` должен быть в `dependsOn`;
+- hooks target operation должны быть подмножеством hooks source guard, как и для обычных dependency rules;
+- для `engine="aux_llm"` нельзя разрешать не-json поведение;
+- для `engine="liquid"` `template` должен компилироваться.
+
+Рекомендация:
+
+- не разрешать `runConditions` без явного `dependsOn`, даже если source guard идёт раньше по `order`.
+
+## 6) Runtime Execution Plan
+
+Затрагиваемый код:
+
+- `server/src/services/chat-generation-v3/operations/execute-operations-phase.ts`
+- новый helper-файл под guard runtime
+- `server/src/services/chat-generation-v3/contracts.ts`
+
+### 6.1 Что не нужно делать
+
+Не нужно:
+
+- переписывать `@core/operation-orchestrator`;
+- делать task ids вида `guard:isBattle`;
+- учить оркестратор понимать branch outputs.
+
+Почему:
+
+- это бизнес-логика operation runtime, а не generic DAG runtime;
+- core orchestrator сейчас правильно изолирован.
+
+### 6.2 Что нужно сделать
+
+Нужно расширить `executeOperationsPhase` так, чтобы:
+
+1. `kind="guard"` входил в executable operations.
+2. Для guard выполнялся отдельный runtime executor.
+3. После выполнения dependency chain, но до старта конкретной операции, проверялись `runConditions`.
+4. Если `runConditions` не совпали, операция помечалась `skipped` с `guard_not_matched`.
+
+Рекомендуемое разбиение:
+
+- `execute-operations-phase.ts` оставляет orchestration flow;
+- новый `guard-operation-executor.ts` выполняет guard;
+- новый `guard-run-conditions.ts` оценивает условия перед стартом операции;
+- новый helper для извлечения guard value из runtime artifacts.
+
+### 6.3 Порядок проверки
+
+Порядок в runtime:
+
+1. Отфильтровать операции по enabled/hook/trigger/activation.
+2. Оркестратор ждёт выполнения `dependsOn`.
+3. Когда конкретная операция становится runnable:
+   - собрать preview state от зависимостей;
+   - проверить `runConditions`;
+   - если хотя бы одно условие не совпало, не исполнять `run`, а вернуть `skipped`.
+
+Рекомендация:
+
+- condition evaluation делать внутри runtime execution path конкретной задачи, а не как статический pre-filter.
+
+Причина:
+
+- условие зависит от runtime values зависимостей, а не только от статической конфигурации.
+
+### 6.4 Guard executor
+
+`guard-operation-executor.ts` должен:
+
+- принимать `op`, `liquidContext`, `abortSignal`;
+- возвращать:
+  - `renderedValue: Record<string, boolean>`
+  - `debugSummary`
+
+#### `engine="liquid"`
+
+Алгоритм:
+
+1. Render Liquid template to string.
+2. Parse JSON.
+3. Validate against derived contract.
+4. Return object.
+
+#### `engine="aux_llm"`
+
+Алгоритм:
+
+1. Render `system` and `prompt`.
+2. Build derived schema from `outputContract`.
+3. Invoke aux LLM in strict json mode.
+4. Validate JSON.
+5. Return object.
+
+### 6.5 Artifact write
+
+Guard effect:
+
+```ts
+{
+  type: "artifact.upsert",
+  opId: op.opId,
+  artifactId: artifactRuntimeKey,
+  format: "json",
+  persistence: artifact.persistence,
+  writeMode: "replace",
+  history: artifact.history,
+  semantics: artifact.semantics ?? "intermediate",
+  value: guardValue
+}
+```
+
+### 6.6 Debug / observability
+
+Нужно логировать безопасно:
+
+- engine type;
+- output keys;
+- whether parsing/validation passed;
+- which downstream operations were skipped by guard;
+- condition mismatch details.
+
+Не нужно логировать без лимитов:
+
+- полный prompt aux guard;
+- полный model output;
+- большие payloads.
+
+## 7) Template Context Plan
+
+Затрагиваемый код:
+
+- `server/src/services/chat-core/prompt-template-context.ts`
+- `server/src/services/chat-core/prompt-template-renderer.ts`
+
+Что уже достаточно:
+
+- `messages`
+- `promptSystem`
+- `art`
+- `artByOpId`
+- `chat`
+- `user`
+- `char`
+
+Что желательно добавить в рамках guard:
+
+- `worldInfo.activatedCount`
+- `worldInfo.activatedEntries`
+- `worldInfo.warnings`
+
+Рекомендация:
+
+- расширять `InstructionRenderContext`, потому что это полезно не только guard.
+
+Что ещё потребуется для `liquid` guard:
+
+- фильтры/хелперы для boolean-friendly вычислений;
+- возможно `json` filter для безопасной сериализации boolean/string values;
+- при необходимости regex helpers.
+
+Рекомендация для v1:
+
+- не делать слишком широкий DSL;
+- добавить только минимальный набор helpers, который нужен для первых реальных сценариев.
+
+## 8) Web / Editor Plan
+
+Затрагиваемый код:
+
+- `web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts`
+- `web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx`
+- новые guard-specific sections
+- `web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/execution-section.tsx`
+- `web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx`
+- `web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx`
+- RU/EN i18n resources
+
+### 8.1 Form model
+
+Нужно добавить новый form-kind:
+
+- `kind="guard"`
+- редактор `outputContract`
+- переключатель engine
+- textarea для liquid template
+- LLM config subset для aux_llm
+- отображение `artifact.format=json` как фиксированного ограничения
+
+### 8.2 Execution section
+
+Нужно добавить UI для `runConditions`.
+
+Вид:
+
+- `source guard`
+- `output key`
+- `operator (is true / is false)`
+
+UX rules:
+
+- список source guards берётся из операций того же блока;
+- список `outputKey` зависит от выбранного source guard;
+- если выбран source guard, которого больше нет, форма показывает ошибку;
+- `source guard` автоматически добавляется в `dependsOn`, либо UI требует сделать это явно.
+
+Рекомендация:
+
+- добавлять dependency автоматически и показывать пользователю это явно.
+
+### 8.3 Node editor
+
+Нужно расширить node model:
+
+- guard node показывает multi-output handles;
+- обычные edges остаются для `dependsOn`;
+- guard-condition edges рисуются отдельно.
+
+Нужны структурированные данные для condition edges:
+
+```ts
+type GuardConditionEdge = {
+  sourceOpId: string;
+  outputKey: string;
+  operator: "is_true" | "is_false";
+  targetOpId: string;
+};
+```
+
+Хранение:
+
+- condition edges не должны вычисляться из строк;
+- они должны строиться из `runConditions`.
+
+Рекомендованный rollout:
+
+1. Сначала form/editor support без сложного graph editing.
+2. Потом node-editor render support.
+3. Потом полноценное редактирование guard edges прямо на графе.
+
+Это уменьшит размер первого PR.
+
+## 9) i18n Plan
+
+Затрагиваемый код:
+
+- `web/src/i18n/resources/ru/operationProfiles.ts`
+- `web/src/i18n/resources/en/operationProfiles.ts`
+
+Нужно добавить:
+
+- новый kind label `guard`;
+- labels для engine;
+- labels для outputs contract;
+- labels для run conditions;
+- help text о том, что guard возвращает JSON boolean map;
+- help text про difference between `dependsOn` and `runConditions`.
+
+## 10) Persistence / Migration
+
+DB migration для нового kind не требуется, если `operations` уже сохраняются как JSON blob и validator просто начнёт
+пропускать новый `kind`.
+
+Нужно проверить:
+
+- не существует ли в UI/server мест с жёстким перечислением `OperationKind`;
+- import/export bundle contracts корректно пропускают новый kind;
+- legacy import paths не ломаются.
+
+Backwards compatibility:
+
+- старые профили должны продолжать работать без изменений;
+- новые guard-операции должны экспортироваться/импортироваться обычным путём;
+- никакой миграции старых `dependsOn` строк не требуется, потому что guard routing вводится как новый контракт.
+
+## 11) Testing Plan
+
+По AGENTS backend/frontend изменения должны идти через TDD.
+
+### 11.1 Shared / validator tests
+
+Нужны тесты на:
+
+- валидный guard block;
+- duplicate output keys;
+- invalid artifact format;
+- runCondition с неизвестным source op;
+- runCondition с source op не guard;
+- runCondition с неизвестным outputKey;
+- runCondition без `dependsOn`.
+
+### 11.2 Runtime tests
+
+Нужны тесты на:
+
+- guard liquid returns valid JSON;
+- guard liquid parse error;
+- guard aux_llm returns valid JSON;
+- guard aux_llm schema validation error;
+- downstream op runs when guard output is true;
+- downstream op skips with `guard_not_matched` when false;
+- multiple outputs branch independently;
+- guard artifact is visible through `art` and `artByOpId`.
+
+### 11.3 UI tests
+
+Нужны тесты на:
+
+- form mapping for guard params;
+- runConditions form serialization/deserialization;
+- node-editor meta/render for guard outputs;
+- RU/EN label presence where practical.
+
+## 12) Recommended Delivery Plan
+
+### Phase 0: Docs + contract alignment
+
+Задачи:
+
+- утвердить spec и contracts;
+- договориться о v1 scope.
+
+Результат:
+
+- согласованный дизайн без спорных string hacks.
+
+### Phase 1: Shared contracts + validator
+
+Задачи:
+
+- обновить shared types;
+- обновить form mapping types;
+- обновить server validators;
+- написать unit tests.
+
+Результат:
+
+- профили с guard корректно сохраняются/валидируются.
+
+### Phase 2: Runtime support
+
+Задачи:
+
+- реализовать `guard-operation-executor`;
+- добавить condition evaluation;
+- обновить runtime result model;
+- написать runtime/integration tests.
+
+Результат:
+
+- guard реально влияет на исполнение графа.
+
+### Phase 3: Editor support
+
+Задачи:
+
+- добавить guard form sections;
+- добавить `runConditions` editor;
+- добавить i18n;
+- написать frontend tests.
+
+Результат:
+
+- feature можно настроить без ручного JSON.
+
+### Phase 4: Node-editor support
+
+Задачи:
+
+- multi-output guard node;
+- read-only render guard branches;
+- затем graph editing for guard branches.
+
+Результат:
+
+- ветвление видно на графе.
+
+### Phase 5: Hardening
+
+Задачи:
+
+- добавить полезные Liquid helpers;
+- расширить context полями world-info runtime;
+- улучшить diagnostics/debug.
+
+Результат:
+
+- guard применим к реальным продвинутым сценариям.
+
+## 13) Open Questions
+
+Нужно решить до реализации:
+
+1. Нужен ли `runOnError="all_false"` в первом релизе, или оставить только `error`.
+2. Нужны ли nested outputs во v1.
+3. Нужно ли разрешать несколько `runConditions` как implicit AND only, или сразу проектировать `AND/OR`.
+4. Добавлять ли guard-ветки в node-editor сразу как редактируемые, или сначала только как отображаемые.
+5. Должен ли `liquid` guard уметь использовать regex helpers из коробки, или это отдельный подэтап.
+
+Рекомендации:
+
+1. `runOnError`: можно оставить оба варианта, но дефолт `error`.
+2. nested outputs: нет.
+3. `runConditions`: только AND во v1.
+4. node-editor editing: отложить на отдельный этап.
+5. regex helpers: добавить только если первый реальный сценарий действительно требует их.
+
+## 14) Definition of Done
+
+Feature считается готовой, когда:
+
+- `kind="guard"` есть в shared contracts;
+- validator принимает и отвергает корректные/некорректные конфиги по стабильным правилам;
+- runtime умеет исполнять guard и пропускать downstream по `runConditions`;
+- `guard_not_matched` виден в runtime results;
+- editor умеет настраивать guard без raw JSON hacks;
+- RU/EN локализация синхронизирована;
+- тесты покрывают validator/runtime/UI-критические кейсы;
+- обязательные проверки зелёные для фактически затронутых слоёв.
+
+## 15) Minimal First PR Recommendation
+
+Если резать работу на минимальный практичный инкремент, рекомендуемый первый PR:
+
+- shared types for `kind="guard"` and `runConditions`;
+- validator support;
+- runtime support only for `engine="aux_llm"`;
+- form support without node-editor branch editing;
+- tests for validator/runtime/form mapping.
+
+Почему именно так:
+
+- `aux_llm` быстрее даёт value для сложных семантических кейсов;
+- `liquid` helpers можно спокойно добавить во втором PR;
+- node-editor graph editing — самая дорогая часть UX, её лучше не смешивать с core runtime.
+
+Альтернативный первый PR:
+
+- `engine="liquid"` first, если приоритет — дешёвый deterministic guard без внешних вызовов.
+
+Выбор зависит от того, какой кейс для команды важнее:
+
+- быстрый semantic routing;
+- или дешёвый local rule engine.
diff --git a/knowledge-base/pipelines-and-processing-spec-v2/13-operation-kind-guard.md b/knowledge-base/pipelines-and-processing-spec-v2/13-operation-kind-guard.md
new file mode 100644
index 00000000..6b4ffff8
--- /dev/null
+++ b/knowledge-base/pipelines-and-processing-spec-v2/13-operation-kind-guard.md
@@ -0,0 +1,524 @@
+# v2 — Operation / kind=guard (контракт guard-операции)
+
+Этот документ описывает контракт для операций с `OperationDefinition.kind="guard"`.
+
+Цель guard-операции: посмотреть на контекст текущего `Run`, выполнить набор проверок и вернуть
+типизированный JSON-результат, по которому другие операции смогут ветвиться.
+
+> Ключевой принцип: `guard` не вводит отдельную магическую модель исполнения.
+> Это обычная операция v2, которая пишет один JSON-артефакт и даёт другим операциям
+> структурированные условия запуска.
+
+## 0) Что такое Guard
+
+`kind="guard"` — это операция-классификатор.
+
+Она:
+
+- читает `OperationContext`;
+- вычисляет набор флагов;
+- возвращает JSON-объект вида `Record<string, boolean>`;
+- пишет этот объект в один `artifact` с `format="json"`;
+- не изменяет prompt/history сама по себе, если это явно не настроено через `artifact.exposures`.
+
+Типичные кейсы:
+
+- проверить последние 5 сообщений на боевую сцену;
+- определить, что сейчас ночь;
+- определить, что сцена стала NSFW;
+- проверить, что активировался нужный world-info/outlet;
+- разветвить дальнейший граф на несколько веток.
+
+## 1) Инварианты v1
+
+Для первого рабочего релиза guard должен быть максимально узким и предсказуемым.
+
+Инварианты:
+
+- guard пишет ровно один артефакт;
+- guard-результат в v1 — плоский JSON-объект с boolean-полями;
+- каждый ключ результата должен быть заранее объявлен в контракте операции;
+- downstream-операции ветвятся не по строке вида `opId:isBattle`, а по структурированным `runConditions`;
+- `false` в guard-результате не является ошибкой;
+- если guard завершился `done`, его артефакт считается валидным и может читаться другими операциями;
+- если downstream-операция не прошла `runConditions`, она получает `status="skipped"` и причину
+  `guard_not_matched`.
+
+Ограничения v1:
+
+- только плоские boolean outputs;
+- без вложенных путей (`combat.isBattle`) и без массивов;
+- без multi-value routing;
+- без implicit conditions через `dependsOn`.
+
+Это ограничение сделано специально, чтобы:
+
+- упростить UI node-editor;
+- упростить валидацию;
+- не превращать guard в ещё один mini-language.
+
+## 2) Контракт результата guard
+
+### 2.1 Shape
+
+Guard-операция обязана вернуть JSON, совместимый с заранее объявленным `outputContract`.
+
+Минимальная форма:
+
+```json
+{
+  "isBattle": true,
+  "isNight": false,
+  "isNSFW": false
+}
+```
+
+### 2.2 OutputContract
+
+Предлагаемый контракт v1:
+
+```ts
+export type GuardOutputDefinition = {
+  key: string;
+  title: string;
+  description?: string;
+};
+
+export type GuardOutputContract = GuardOutputDefinition[];
+```
+
+Правила:
+
+- `key` уникален внутри операции;
+- `key` должен соответствовать безопасному формату идентификатора, например `^[a-z][a-zA-Z0-9_]*$`;
+- каждый `key` обязан присутствовать в runtime-результате;
+- значение каждого `key` должно быть boolean;
+- лишние поля в результате guard не допускаются в strict-режиме v1.
+
+Пример:
+
+```ts
+outputContract: [
+  { key: "isBattle", title: "Battle" },
+  { key: "isNight", title: "Night time" },
+  { key: "isNSFW", title: "NSFW" },
+]
+```
+
+### 2.3 Почему не `jsonSchema` общего вида
+
+Внутренне можно генерировать `jsonSchema` из `outputContract`, но внешний контракт guard лучше держать отдельным.
+
+Причины:
+
+- node-editor должен заранее знать, какие ветки рисовать;
+- UI должен уметь показывать именованные выходы;
+- валидация связи должна понимать не просто JSON, а ветку guard output;
+- nested JSON сильно усложнит UX и runtime на первом этапе.
+
+Вывод: в v1 guard имеет собственный небольшой контракт outputs, а не произвольную JSON-схему.
+
+## 3) `params` для `kind="guard"`
+
+Предлагаемый минимальный контракт:
+
+```ts
+export type GuardEngine = "liquid" | "aux_llm";
+
+export type GuardRunOnError = "error" | "all_false";
+
+export type GuardParams =
+  | {
+      engine: "liquid";
+      outputContract: GuardOutputContract;
+      template: string;
+      strictVariables?: boolean;
+      runOnError?: GuardRunOnError;
+      artifact: OperationArtifactConfig;
+    }
+  | {
+      engine: "aux_llm";
+      outputContract: GuardOutputContract;
+      system?: string;
+      prompt: string;
+      strictVariables?: boolean;
+      providerId: "openrouter" | "openai_compatible";
+      credentialRef: string;
+      model?: string;
+      timeoutMs?: number;
+      retry?: LlmOperationRetry;
+      samplers?: LlmOperationSamplers;
+      runOnError?: GuardRunOnError;
+      artifact: OperationArtifactConfig;
+    };
+```
+
+### 3.1 `engine="liquid"`
+
+Liquid-guard нужен для дешёвых, быстрых и детерминированных проверок.
+
+Идея v1:
+
+- `template` рендерится через LiquidJS;
+- результатом рендера должна быть JSON-строка;
+- эта JSON-строка парсится и валидируется по `outputContract`.
+
+Пример:
+
+```liquid
+{
+  "isBattle": {{ recentMessagesText(5) contains "attack" | json }},
+  "isNight": {{ world.timeOfDay == "night" | json }},
+  "isNSFW": {{ recentMessagesText(5) contains "kiss" | json }}
+}
+```
+
+Примечание: для такого сценария потребуется расширить набор внутренних Liquid filters/helpers, потому что текущий
+контекст и фильтры покрывают не все нужные проверки.
+
+### 3.2 `engine="aux_llm"`
+
+Aux-LLM guard нужен для нечётких семантических проверок, где regex/contains уже не хватает.
+
+Идея v1:
+
+- `system` и `prompt` рендерятся как Liquid-шаблоны;
+- aux LLM вызывается в JSON-режиме;
+- schema для ответа автоматически выводится из `outputContract`;
+- результат строго валидируется;
+- на выходе guard всё равно пишет тот же boolean JSON.
+
+Важный принцип:
+
+- оба engine должны приводиться к одному и тому же runtime-контракту;
+- downstream-операции не должны знать, как именно guard вычислялся.
+
+### 3.3 `runOnError`
+
+Предлагаемый рабочий минимум:
+
+- `error` — ошибка вычисления завершает guard как `status="error"`;
+- `all_false` — ошибка вычисления приводит к synthetic-результату, где все outputs=`false`, и guard
+  завершается `done`.
+
+Рекомендация для v1:
+
+- дефолт = `error`;
+- `all_false` использовать только там, где пропуск ветки безопаснее, чем остановка сценария.
+
+## 4) Входы guard-операции
+
+Guard читает стандартный `OperationContext`.
+
+На практике для guard особенно важны:
+
+- `messages`;
+- `promptSystem`;
+- `art` и `artByOpId`;
+- `chat`;
+- `char`;
+- `user`;
+- `rag`;
+- world-info, уже разрешённый в template context;
+- future runtime meta для world-info activation/debug.
+
+Для реальных guard-кейсов v1 желательно дополнить context удобными полями:
+
+- `worldInfo.activatedCount`;
+- `worldInfo.activatedEntries`;
+- `worldInfo.warnings`;
+- `chatRuntime` или аналогичный объект для derived runtime facts.
+
+## 5) Как downstream-операции ветвятся
+
+### 5.1 Почему недостаточно `dependsOn`
+
+`dependsOn` отвечает только на вопрос “когда можно стартовать”.
+
+Для guard нам нужен отдельный вопрос:
+
+- можно ли запускать эту операцию при текущем значении guard outputs.
+
+Поэтому v1 должен ввести второй механизм: `runConditions`.
+
+### 5.2 Предлагаемый контракт `runConditions`
+
+```ts
+export type OperationRunCondition =
+  | {
+      type: "guard_output";
+      sourceOpId: string;
+      outputKey: string;
+      operator: "is_true";
+    }
+  | {
+      type: "guard_output";
+      sourceOpId: string;
+      outputKey: string;
+      operator: "is_false";
+    };
+```
+
+Расширение `OperationConfig`:
+
+```ts
+export type OperationConfig<TParams extends OperationParams = OperationParams> = {
+  enabled: boolean;
+  required: boolean;
+  hooks: OperationHook[];
+  triggers?: OperationTrigger[];
+  activation?: OperationActivationConfig;
+  order: number;
+  dependsOn?: string[];
+  runConditions?: OperationRunCondition[];
+  params: TParams;
+};
+```
+
+### 5.3 Обязательное правило согласованности
+
+Если операция ссылается на guard через `runConditions`, этот `sourceOpId` должен также присутствовать в `dependsOn`.
+
+Причины:
+
+- явный порядок исполнения;
+- понятный граф зависимостей;
+- предсказуемый preview state;
+- простая валидация.
+
+Правило:
+
+- `runCondition.sourceOpId` обязательно входит в `dependsOn`;
+- `sourceOpId` обязан ссылаться именно на `kind="guard"`;
+- `outputKey` обязан существовать в `sourceOpId.config.params.outputContract`.
+
+### 5.4 Почему не `opId:isBattle`
+
+Строковый формат вида `combat_guard:isBattle` не рекомендуется и не должен становиться канонической моделью.
+
+Причины:
+
+- невозможно нормально типизировать;
+- сложно валидировать на save-time;
+- сложно мигрировать;
+- плохо отображается в UI;
+- смешивает граф выполнения и граф ветвления в одну непрозрачную строку.
+
+## 6) Runtime-семантика
+
+### 6.1 Guard сам по себе
+
+Если guard отработал успешно:
+
+- `status="done"`;
+- в `effects` есть один `artifact.upsert` с JSON-объектом `Record<string, boolean>`;
+- downstream-операции могут читать этот артефакт через `art` и `artByOpId`.
+
+Если guard вернул валидный JSON, где часть флагов `false`:
+
+- это нормальный результат;
+- guard не считается `skipped`;
+- guard не считается `error`.
+
+### 6.2 Downstream-операция с guard-условием
+
+Алгоритм:
+
+1. Операция ждёт завершения всех `dependsOn` со статусом `done`.
+2. Перед стартом runtime проверяет все `runConditions`.
+3. Если все условия совпали, операция стартует как обычно.
+4. Если хотя бы одно условие не совпало, операция не стартует и получает:
+   - `status="skipped"`
+   - `skipReason="guard_not_matched"`
+   - `skipDetails` с объяснением, какое условие не совпало.
+
+Предлагаемый `skipDetails`:
+
+```ts
+skipDetails: {
+  guard?: {
+    sourceOpId: string;
+    outputKey: string;
+    operator: "is_true" | "is_false";
+    actual: boolean | null;
+  };
+}
+```
+
+## 7) Node-editor модель
+
+Guard должен отображаться как узел с несколькими именованными выходами.
+
+v1 UI-контракт:
+
+- у guard-узла есть стандартный target handle для `dependsOn`;
+- у guard-узла есть несколько source handles, по одному на каждый `outputContract.key`;
+- edge guard-ветки хранит не строку, а структурированную ссылку:
+  - `sourceOpId`
+  - `outputKey`
+  - `operator`
+  - `targetOpId`
+
+Рекомендуемая визуальная модель:
+
+- обычные `dependsOn` edges: нейтральные;
+- guard-edges: отдельный стиль, label=`isBattle=true` или `isBattle=false`.
+
+Важно:
+
+- граф зависимостей и граф условий логически разные;
+- в UI их можно рисовать как два типа рёбер, но в модели данных они не должны смешиваться.
+
+## 8) Артефакт guard
+
+Guard остаётся совместим с существующей artifact-моделью.
+
+Рекомендации для `artifact`:
+
+- `format="json"`
+- `writeMode="replace"`
+- `persistence="run_only"` по умолчанию
+- `semantics="intermediate"` или `semantics="state"`
+- `history.enabled=true` допустимо, но не обязательно
+
+По умолчанию у guard не должно быть prompt/UI exposures.
+
+Причина:
+
+- guard прежде всего решает ветвление, а не инжектит текст.
+
+## 9) Валидация save-time
+
+Guard требует новых правил в валидаторе блока/профиля.
+
+Минимум:
+
+- `kind="guard"` распознаётся схемой;
+- `artifact.format` для guard должен быть `json`;
+- `outputContract` не пустой;
+- `outputContract.key` уникальны;
+- `runConditions[].sourceOpId` существует;
+- `runConditions[].sourceOpId` ссылается на `kind="guard"`;
+- `runConditions[].outputKey` существует в guard-контракте;
+- `runConditions[].sourceOpId` входит в `dependsOn`;
+- hooks downstream-операции должны быть совместимы с hooks guard-операции.
+
+Для `engine="aux_llm"`:
+
+- runtime JSON schema автоматически выводится из `outputContract`;
+- `strictSchemaValidation=true` включается принудительно;
+- `outputMode="json"` фиксируется принудительно.
+
+Для `engine="liquid"`:
+
+- `template` должен компилироваться как Liquid;
+- runtime JSON парсинг и contract validation обязательны.
+
+## 10) Ошибки
+
+Рекомендуемые коды ошибок:
+
+- `GUARD_TEMPLATE_RENDER_ERROR`
+- `GUARD_OUTPUT_PARSE_ERROR`
+- `GUARD_OUTPUT_VALIDATION_ERROR`
+- `GUARD_PROVIDER_ERROR`
+- `GUARD_TIMEOUT`
+- `GUARD_INVALID_PARAMS`
+
+Семантика:
+
+- ошибка вычисления guard = ошибка самой guard-операции;
+- `false` в выходе guard = не ошибка;
+- пропуск downstream по guard = `skipped`, не ошибка guard-а.
+
+## 11) Пример профиля
+
+Пример guard:
+
+```json
+{
+  "opId": "combat_guard",
+  "name": "Combat guard",
+  "kind": "guard",
+  "config": {
+    "enabled": true,
+    "required": false,
+    "hooks": ["before_main_llm"],
+    "order": 100,
+    "params": {
+      "engine": "aux_llm",
+      "outputContract": [
+        { "key": "isBattle", "title": "Battle" },
+        { "key": "isNSFW", "title": "NSFW" }
+      ],
+      "system": "Classify the scene.",
+      "prompt": "Look at the last 5 messages and return JSON only.",
+      "providerId": "openrouter",
+      "credentialRef": "cred-1",
+      "model": "openai/gpt-5-mini",
+      "artifact": {
+        "artifactId": "artifact:combat_guard",
+        "tag": "combat_guard_state",
+        "title": "Combat guard state",
+        "format": "json",
+        "persistence": "run_only",
+        "writeMode": "replace",
+        "history": { "enabled": true, "maxItems": 20 },
+        "exposures": []
+      }
+    }
+  }
+}
+```
+
+Пример downstream:
+
+```json
+{
+  "opId": "combat_dice",
+  "name": "Combat dice",
+  "kind": "llm",
+  "config": {
+    "enabled": true,
+    "required": false,
+    "hooks": ["before_main_llm"],
+    "order": 200,
+    "dependsOn": ["combat_guard"],
+    "runConditions": [
+      {
+        "type": "guard_output",
+        "sourceOpId": "combat_guard",
+        "outputKey": "isBattle",
+        "operator": "is_true"
+      }
+    ],
+    "params": {}
+  }
+}
+```
+
+## 12) Рекомендация по реализации
+
+Guard лучше реализовывать как новый `kind`, но не делать core-orchestrator guard-aware.
+
+Рекомендованный слой реализации:
+
+- `shared/**`: типы `kind="guard"` и `runConditions`;
+- `server/src/services/operations/**`: save-time validation;
+- `server/src/services/chat-generation-v3/operations/**`: runtime execute + condition evaluation;
+- `web/**`: editor + node-editor + i18n.
+
+Сам `@core/operation-orchestrator` должен остаться универсальным DAG-исполнителем, знающим только о задачах и
+зависимостях.
+
+## 13) Итог
+
+Guard в v1 — это:
+
+- новый `OperationKind`;
+- два движка: `liquid` и `aux_llm`;
+- один JSON-артефакт;
+- плоский boolean output contract;
+- отдельные `runConditions` для ветвления;
+- multi-output узел в node-editor;
+- никакой строковой магии в `dependsOn`.
diff --git a/knowledge-base/pipelines-and-processing-spec-v2/map.md b/knowledge-base/pipelines-and-processing-spec-v2/map.md
index 36e74ae8..756755ee 100644
--- a/knowledge-base/pipelines-and-processing-spec-v2/map.md
+++ b/knowledge-base/pipelines-and-processing-spec-v2/map.md
@@ -11,6 +11,7 @@
   - [16 — Effect Commit (как применяются эффекты)](./16-effect-commit.md)
   - [11 — Operation / kind=llm](./11-operation-kind-llm.md)
   - [12 — Operation / kind=template](./12-operation-kind-template.md)
+  - [13 — Operation / kind=guard](./13-operation-kind-guard.md)
 - [20 — OperationProfile (профиль операций)](./20-operation-profile.md)
 - [30 — Run (жизненный цикл запуска и граница main LLM)](./30-run.md)
 - [40 — Artifacts (артефакты)](./40-artifacts.md)
diff --git a/server/src/core/operation-orchestrator/executor.ts b/server/src/core/operation-orchestrator/executor.ts
index f7bfa987..1c737dda 100644
--- a/server/src/core/operation-orchestrator/executor.ts
+++ b/server/src/core/operation-orchestrator/executor.ts
@@ -1,4 +1,5 @@
 import { OrchestratorError } from "./errors";
+import { isTaskSkipError } from "./skip";
 import {
   abortReasonToString,
   createSafeEventEmitter,
@@ -30,6 +31,13 @@ type ExecutePlanArgs = {
 
 type TaskCompletion =
   | { taskId: TaskId; status: "done"; startedAt: number; finishedAt: number; result: unknown }
+  | {
+      taskId: TaskId;
+      status: "skipped";
+      startedAt: number;
+      finishedAt: number;
+      reason: "runtime_condition";
+    }
   | {
       taskId: TaskId;
       status: "error";
@@ -249,6 +257,16 @@ export async function executeOrchestratorPlan(args: ExecutePlanArgs): Promise<vo
       };
     }
 
+    if (completion.status === "skipped") {
+      return {
+        taskId: completion.taskId,
+        status: "skipped",
+        startedAt: completion.startedAt,
+        finishedAt: completion.finishedAt,
+        reason: completion.reason,
+      };
+    }
+
     if (completion.status === "error") {
       return {
         taskId: completion.taskId,
@@ -290,6 +308,23 @@ export async function executeOrchestratorPlan(args: ExecutePlanArgs): Promise<vo
       return { taskId: task.taskId, status: "done", startedAt, finishedAt, result };
     } catch (error) {
       const finishedAt = nowFn();
+      if (isTaskSkipError(error)) {
+        emitEvent({
+          type: "orch.task.skipped",
+          data: { runId: ctx.runId, taskId: task.taskId, reason: error.reason },
+        });
+        emitEvent({
+          type: "orch.task.finished",
+          data: { runId: ctx.runId, taskId: task.taskId, status: "skipped" },
+        });
+        return {
+          taskId: task.taskId,
+          status: "skipped",
+          startedAt,
+          finishedAt,
+          reason: "runtime_condition",
+        };
+      }
       const aborted = classifyAbortError(error, { signal: ctx.signal });
 
       if (aborted) {
diff --git a/server/src/core/operation-orchestrator/index.ts b/server/src/core/operation-orchestrator/index.ts
index 443f0fa4..9f64a4ee 100644
--- a/server/src/core/operation-orchestrator/index.ts
+++ b/server/src/core/operation-orchestrator/index.ts
@@ -2,6 +2,7 @@ export { OrchestratorError } from "./errors";
 export { executeOrchestratorPlan } from "./executor";
 export { buildOrchestratorPlan } from "./planner";
 export { runOrchestrator } from "./orchestrator";
+export { createTaskSkip, isTaskSkipError } from "./skip";
 
 export type { OrchestratorPlan, OrchestratorPlanningResult } from "./planner";
 export type {
@@ -19,4 +20,3 @@ export type {
   TaskSkipReason,
   TaskStatus,
 } from "./types";
-
diff --git a/server/src/core/operation-orchestrator/skip.ts b/server/src/core/operation-orchestrator/skip.ts
new file mode 100644
index 00000000..24097507
--- /dev/null
+++ b/server/src/core/operation-orchestrator/skip.ts
@@ -0,0 +1,19 @@
+import type { TaskSkipReason } from "./types";
+
+type TaskSkipError = Error & {
+  code: "ORCHESTRATOR_TASK_SKIP";
+  reason: TaskSkipReason;
+};
+
+export function createTaskSkip(reason: TaskSkipReason, message?: string): TaskSkipError {
+  const error = new Error(message ?? reason) as TaskSkipError;
+  error.code = "ORCHESTRATOR_TASK_SKIP";
+  error.reason = reason;
+  return error;
+}
+
+export function isTaskSkipError(error: unknown): error is TaskSkipError {
+  if (!error || typeof error !== "object") return false;
+  const candidate = error as { code?: unknown; reason?: unknown };
+  return candidate.code === "ORCHESTRATOR_TASK_SKIP" && typeof candidate.reason === "string";
+}
diff --git a/server/src/core/operation-orchestrator/types.ts b/server/src/core/operation-orchestrator/types.ts
index 8307cd1d..f43d7b74 100644
--- a/server/src/core/operation-orchestrator/types.ts
+++ b/server/src/core/operation-orchestrator/types.ts
@@ -17,7 +17,8 @@ export type TaskSkipReason =
   | "filtered_out"
   | "dependency_missing"
   | "dependency_not_done"
-  | "orchestrator_aborted";
+  | "orchestrator_aborted"
+  | "runtime_condition";
 
 export type OrchestratorTask<TResult = unknown> = {
   taskId: TaskId;
@@ -135,4 +136,3 @@ export type OrchestratorRunOptions = {
   now?: () => number;
   classifyAbortError?: (error: unknown, ctx: { signal: AbortSignal }) => boolean;
 };
-
diff --git a/server/src/services/chat-core/prompt-template-context.ts b/server/src/services/chat-core/prompt-template-context.ts
index f30fff9b..44026801 100644
--- a/server/src/services/chat-core/prompt-template-context.ts
+++ b/server/src/services/chat-core/prompt-template-context.ts
@@ -142,6 +142,13 @@ function cloneTemplateContextForWorldInfoRender(
     anBottom: context.anBottom ? [...context.anBottom] : [],
     emTop: context.emTop ? [...context.emTop] : [],
     emBottom: context.emBottom ? [...context.emBottom] : [],
+    worldInfo: context.worldInfo
+      ? {
+          activatedCount: context.worldInfo.activatedCount,
+          activatedEntries: context.worldInfo.activatedEntries.map((entry) => ({ ...entry })),
+          warnings: [...context.worldInfo.warnings],
+        }
+      : undefined,
   };
   applyWorldInfoToTemplateContext(cloned, worldInfo);
   return cloned;
@@ -429,6 +436,15 @@ export async function resolveAndApplyWorldInfoToTemplateContext(params: {
     context: params.context,
   });
   applyWorldInfoToTemplateContext(params.context, resolved);
+  params.context.worldInfo = {
+    activatedCount: resolved.activatedCount,
+    activatedEntries: resolved.activatedEntries.map((entry) => ({
+      ...entry,
+      matchedKeys: [...entry.matchedKeys],
+      reasons: [...entry.reasons],
+    })),
+    warnings: [...resolved.warnings],
+  };
   return resolved;
 }
 
@@ -485,6 +501,11 @@ export async function buildInstructionRenderContext(params: {
     chat: {},
     messages: [],
     rag: {},
+    worldInfo: {
+      activatedCount: 0,
+      activatedEntries: [],
+      warnings: [],
+    },
     art: {},
     now: new Date().toISOString(),
   };
@@ -539,6 +560,11 @@ export async function buildInstructionRenderContext(params: {
     },
     messages: history.map((m) => ({ role: m.role, content: m.content })),
     rag: {},
+    worldInfo: {
+      activatedCount: 0,
+      activatedEntries: [],
+      warnings: [],
+    },
     art: {},
     now: new Date().toISOString(),
   }, params.worldInfo);
diff --git a/server/src/services/chat-core/prompt-template-renderer.ts b/server/src/services/chat-core/prompt-template-renderer.ts
index cb3c1502..ebe6f086 100644
--- a/server/src/services/chat-core/prompt-template-renderer.ts
+++ b/server/src/services/chat-core/prompt-template-renderer.ts
@@ -6,6 +6,20 @@ export interface InstructionRenderContext {
   chat: unknown;
   messages: Array<{ role: string; content: string }>;
   rag: unknown;
+  worldInfo?: {
+    activatedCount: number;
+    activatedEntries: Array<{
+      hash: string;
+      bookId: string;
+      bookName: string;
+      uid: number;
+      comment: string;
+      content: string;
+      matchedKeys: string[];
+      reasons: string[];
+    }>;
+    warnings: string[];
+  };
   // Artifacts materialized as `art.<artifactId>.value/history`.
   // `artByOpId` is a convenience alias for cross-operation references from templates.
   art?: Record<string, unknown>;
@@ -160,6 +174,7 @@ function registerInternalFilters(liquid: Liquid): Liquid {
       return resolveRecentMessagesHelper(helperName, rawArg, messages);
     }
   );
+  liquid.registerFilter("json", (input: unknown) => JSON.stringify(input));
   return liquid;
 }
 
diff --git a/server/src/services/chat-generation-v3/contracts.ts b/server/src/services/chat-generation-v3/contracts.ts
index aed4ed12..3e2610e0 100644
--- a/server/src/services/chat-generation-v3/contracts.ts
+++ b/server/src/services/chat-generation-v3/contracts.ts
@@ -179,6 +179,7 @@ export type OperationSkipReason =
   | "activation_not_reached"
   | "dependency_not_done"
   | "dependency_missing"
+  | "guard_not_matched"
   | "unsupported_kind"
   | "orchestrator_aborted"
   | "filtered_out"
@@ -193,6 +194,12 @@ export type OperationSkipDetails = {
   };
   blockedByOpIds?: string[];
   blockedByReason?: "activation_not_reached";
+  guard?: {
+    sourceOpId: string;
+    outputKey: string;
+    operator: "is_true" | "is_false";
+    actual: boolean | null;
+  };
 };
 
 export type OperationExecutionResult = {
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
index 8cc498df..d957e680 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.test.ts
@@ -34,6 +34,7 @@ vi.mock("../../llm/llm-gateway-adapter", () => ({
 
 type TemplateOp = Extract<OperationInProfile, { kind: "template" }>;
 type LlmOp = Extract<OperationInProfile, { kind: "llm" }>;
+type GuardOp = Extract<OperationInProfile, { kind: "guard" }>;
 
 function toArtifact(params: {
   opId: string;
@@ -209,6 +210,70 @@ function makeComputeOp(params: {
   };
 }
 
+function makeGuardOp(params: {
+  opId: string;
+  order: number;
+  engine: "liquid" | "aux_llm";
+  outputContract: Array<{ key: string; title: string }>;
+  template?: string;
+  system?: string;
+  prompt?: string;
+  dependsOn?: string[];
+}): GuardOp {
+  const artifact = normalizeOperationArtifactConfig({
+    opId: params.opId,
+    kind: "guard",
+    title: params.opId,
+    rawParams: {
+      artifact: {
+        artifactId: `artifact:${params.opId}`,
+        tag: `${params.opId.replace(/[^a-z0-9]+/gi, "_").toLowerCase()}_state`,
+        title: `${params.opId} state`,
+        format: "json",
+        persistence: "run_only",
+        writeMode: "replace",
+        history: {
+          enabled: true,
+          maxItems: 20,
+        },
+        exposures: [],
+      },
+    },
+  });
+  const guardParams =
+    params.engine === "liquid"
+      ? {
+          engine: "liquid" as const,
+          outputContract: params.outputContract,
+          template: params.template ?? "{\"matched\": true}",
+          artifact,
+        }
+      : {
+          engine: "aux_llm" as const,
+          outputContract: params.outputContract,
+          providerId: "openrouter" as const,
+          credentialRef: "token-1",
+          system: params.system,
+          prompt: params.prompt ?? "Return guard JSON",
+          artifact,
+        };
+
+  return {
+    opId: params.opId,
+    name: params.opId,
+    kind: "guard",
+    config: {
+      enabled: true,
+      required: false,
+      hooks: ["before_main_llm"],
+      triggers: ["generate", "regenerate"],
+      order: params.order,
+      dependsOn: params.dependsOn,
+      params: guardParams,
+    },
+  };
+}
+
 function makeBaseMessages() {
   return [
     { role: "system" as const, content: "sys" },
@@ -564,6 +629,260 @@ describe("executeOperationsPhase", () => {
     });
   });
 
+  test("executes liquid guard and stores json artifact", async () => {
+    const out = await executeOperationsPhase({
+      runId: "run-guard-liquid",
+      hook: "before_main_llm",
+      trigger: "generate",
+      operations: [
+        makeGuardOp({
+          opId: "guard-liquid",
+          order: 10,
+          engine: "liquid",
+          outputContract: [{ key: "isBattle", title: "Battle" }],
+          template: "{\"isBattle\": true}",
+        }),
+      ],
+      executionMode: "sequential",
+      baseMessages: makeBaseMessages(),
+      baseArtifacts: makeBaseArtifacts(),
+      assistantText: "",
+      templateContext: makeTemplateContext(),
+    });
+
+    expect(out[0]).toMatchObject({
+      opId: "guard-liquid",
+      status: "done",
+    });
+    expect(out[0]?.effects[0]).toMatchObject({
+      type: "artifact.upsert",
+      format: "json",
+      value: {
+        isBattle: true,
+      },
+    });
+  });
+
+  test("fails liquid guard when rendered output is not valid json", async () => {
+    const out = await executeOperationsPhase({
+      runId: "run-guard-liquid-error",
+      hook: "before_main_llm",
+      trigger: "generate",
+      operations: [
+        makeGuardOp({
+          opId: "guard-liquid",
+          order: 10,
+          engine: "liquid",
+          outputContract: [{ key: "isBattle", title: "Battle" }],
+          template: "not-json",
+        }),
+      ],
+      executionMode: "sequential",
+      baseMessages: makeBaseMessages(),
+      baseArtifacts: makeBaseArtifacts(),
+      assistantText: "",
+      templateContext: makeTemplateContext(),
+    });
+
+    expect(out[0]?.status).toBe("error");
+    expect(out[0]?.error?.code).toBe("GUARD_OUTPUT_PARSE_ERROR");
+  });
+
+  test("executes aux llm guard and validates json output", async () => {
+    mocks.llmGatewayStream.mockImplementation(() =>
+      streamOf([
+        { type: "delta", text: "{\"isBattle\":true}" },
+        { type: "done", status: "done" },
+      ])
+    );
+
+    const out = await executeOperationsPhase({
+      runId: "run-guard-aux",
+      hook: "before_main_llm",
+      trigger: "generate",
+      operations: [
+        makeGuardOp({
+          opId: "guard-aux",
+          order: 10,
+          engine: "aux_llm",
+          outputContract: [{ key: "isBattle", title: "Battle" }],
+          prompt: "Return guard JSON",
+        }),
+      ],
+      executionMode: "sequential",
+      baseMessages: makeBaseMessages(),
+      baseArtifacts: makeBaseArtifacts(),
+      assistantText: "",
+      templateContext: makeTemplateContext(),
+    });
+
+    expect(out[0]?.status).toBe("done");
+    expect(out[0]?.effects[0]).toMatchObject({
+      type: "artifact.upsert",
+      format: "json",
+      value: {
+        isBattle: true,
+      },
+    });
+  });
+
+  test("fails aux llm guard when schema does not match output contract", async () => {
+    mocks.llmGatewayStream.mockImplementation(() =>
+      streamOf([
+        { type: "delta", text: "{\"isBattle\":\"yes\"}" },
+        { type: "done", status: "done" },
+      ])
+    );
+
+    const out = await executeOperationsPhase({
+      runId: "run-guard-aux-invalid",
+      hook: "before_main_llm",
+      trigger: "generate",
+      operations: [
+        makeGuardOp({
+          opId: "guard-aux",
+          order: 10,
+          engine: "aux_llm",
+          outputContract: [{ key: "isBattle", title: "Battle" }],
+        }),
+      ],
+      executionMode: "sequential",
+      baseMessages: makeBaseMessages(),
+      baseArtifacts: makeBaseArtifacts(),
+      assistantText: "",
+      templateContext: makeTemplateContext(),
+    });
+
+    expect(out[0]?.status).toBe("error");
+    expect(out[0]?.error?.code).toBe("GUARD_OUTPUT_VALIDATION_ERROR");
+  });
+
+  test("skips downstream operation when guard condition does not match", async () => {
+    const out = await executeOperationsPhase({
+      runId: "run-guard-skip",
+      hook: "before_main_llm",
+      trigger: "generate",
+      operations: [
+        makeGuardOp({
+          opId: "guard-liquid",
+          order: 10,
+          engine: "liquid",
+          outputContract: [{ key: "isBattle", title: "Battle" }],
+          template: "{\"isBattle\": false}",
+        }),
+        {
+          ...makeTemplateOp({
+            opId: "consumer",
+            order: 20,
+            dependsOn: ["guard-liquid"],
+            template: "combat",
+            output: artifactOutput("consumer_out"),
+          }),
+          config: {
+            ...makeTemplateOp({
+              opId: "consumer",
+              order: 20,
+              dependsOn: ["guard-liquid"],
+              template: "combat",
+              output: artifactOutput("consumer_out"),
+            }).config,
+            runConditions: [
+              {
+                type: "guard_output",
+                sourceOpId: "guard-liquid",
+                outputKey: "isBattle",
+                operator: "is_true",
+              },
+            ],
+          },
+        },
+      ],
+      executionMode: "sequential",
+      baseMessages: makeBaseMessages(),
+      baseArtifacts: makeBaseArtifacts(),
+      assistantText: "",
+      templateContext: makeTemplateContext(),
+    });
+
+    const byId = new Map(out.map((item) => [item.opId, item] as const));
+    expect(byId.get("guard-liquid")?.status).toBe("done");
+    expect(byId.get("consumer")).toMatchObject({
+      status: "skipped",
+      skipReason: "guard_not_matched",
+      skipDetails: {
+        guard: {
+          sourceOpId: "guard-liquid",
+          outputKey: "isBattle",
+          operator: "is_true",
+          actual: false,
+        },
+      },
+    });
+  });
+
+  test("runs downstream operation only when all guard conditions match", async () => {
+    const consumerBase = makeTemplateOp({
+      opId: "consumer",
+      order: 30,
+      dependsOn: ["guard-a", "guard-b"],
+      template: "combat-night",
+      output: artifactOutput("consumer_out"),
+    });
+    const out = await executeOperationsPhase({
+      runId: "run-guard-and",
+      hook: "before_main_llm",
+      trigger: "generate",
+      operations: [
+        makeGuardOp({
+          opId: "guard-a",
+          order: 10,
+          engine: "liquid",
+          outputContract: [{ key: "isBattle", title: "Battle" }],
+          template: "{\"isBattle\": true}",
+        }),
+        makeGuardOp({
+          opId: "guard-b",
+          order: 20,
+          engine: "liquid",
+          outputContract: [{ key: "isNight", title: "Night" }],
+          template: "{\"isNight\": true}",
+        }),
+        {
+          ...consumerBase,
+          config: {
+            ...consumerBase.config,
+            runConditions: [
+              {
+                type: "guard_output",
+                sourceOpId: "guard-a",
+                outputKey: "isBattle",
+                operator: "is_true",
+              },
+              {
+                type: "guard_output",
+                sourceOpId: "guard-b",
+                outputKey: "isNight",
+                operator: "is_true",
+              },
+            ],
+          },
+        },
+      ],
+      executionMode: "sequential",
+      baseMessages: makeBaseMessages(),
+      baseArtifacts: makeBaseArtifacts(),
+      assistantText: "",
+      templateContext: makeTemplateContext(),
+    });
+
+    const byId = new Map(out.map((item) => [item.opId, item] as const));
+    expect(byId.get("consumer")?.status).toBe("done");
+    expect(byId.get("consumer")?.effects[0]).toMatchObject({
+      type: "artifact.upsert",
+      value: "combat-night",
+    });
+  });
+
   test("normalizes dependency_missing to dependency_not_done when dependency is activation-skipped", async () => {
     const finishedEvents = collectEvents<{
       opId: string;
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
index 12168ba9..f3fecc1a 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
@@ -1,4 +1,4 @@
-import { runOrchestrator } from "@core/operation-orchestrator";
+import { createTaskSkip, runOrchestrator } from "@core/operation-orchestrator";
 
 import { renderLiquidTemplate } from "../../chat-core/prompt-template-renderer";
 import {
@@ -13,6 +13,8 @@ import {
 } from "../contracts";
 
 import { applyPromptEffect } from "./effect-handlers/prompt-effects";
+import { executeGuardOperation } from "./guard-operation-executor";
+import { evaluateGuardRunConditions } from "./guard-run-conditions";
 import { executeLlmOperation } from "./llm-operation-executor";
 
 import type { TaskResult } from "../../../core/operation-orchestrator/types";
@@ -236,6 +238,11 @@ function resolveSkipReasonAndDetails(params: {
   blockedByOpIds?: string[];
   activationSkippedByOpId: ReadonlyMap<string, NonNullable<OperationSkipDetails["activation"]>>;
 }): { skipReason: OperationSkipReason; skipDetails?: OperationSkipDetails } {
+  if (params.reason === "guard_not_matched") {
+    return {
+      skipReason: "guard_not_matched",
+    };
+  }
   const blockedByOpIds = normalizeBlockedByOpIds(
     params.blockedByOpIds?.length
       ? params.blockedByOpIds
@@ -280,6 +287,10 @@ function mapTaskResult(params: {
   task: TaskResult;
   op: OperationInProfile;
   activationSkippedByOpId: ReadonlyMap<string, NonNullable<OperationSkipDetails["activation"]>>;
+  runtimeSkippedMetaByOpId: ReadonlyMap<
+    string,
+    { skipReason: OperationSkipReason; skipDetails?: OperationSkipDetails }
+  >;
 }): OperationExecutionResult {
   const { task, op } = params;
   if (task.status === "done") {
@@ -343,6 +354,22 @@ function mapTaskResult(params: {
     };
   }
 
+  const runtimeSkipped = params.runtimeSkippedMetaByOpId.get(op.opId);
+  if (runtimeSkipped) {
+    return {
+      opId: op.opId,
+      name: op.name,
+      required: op.config.required,
+      hook: params.hook,
+      status: "skipped",
+      order: op.config.order,
+      dependsOn: op.config.dependsOn ?? [],
+      effects: [],
+      skipReason: runtimeSkipped.skipReason,
+      skipDetails: runtimeSkipped.skipDetails,
+    };
+  }
+
   const normalized = resolveSkipReasonAndDetails({
     reason: task.reason as OperationSkipReason,
     dependsOn: op.config.dependsOn ?? [],
@@ -448,14 +475,15 @@ export async function executeOperationsPhase(params: {
   }
 
   const executableOps = runnableOperations.filter(
-    (op): op is Extract<OperationInProfile, { kind: "template" | "llm" }> =>
-      op.kind === "template" || op.kind === "llm"
+    (op): op is Extract<OperationInProfile, { kind: "template" | "llm" | "guard" }> =>
+      op.kind === "template" || op.kind === "llm" || op.kind === "guard"
   );
   const executableOpsById = new Map(executableOps.map((op) => [op.opId, op]));
+  const operationsById = new Map(params.operations.map((op) => [op.opId, op] as const));
   const executableTaskIdSet = new Set(executableOps.map((op) => op.opId));
   const unsupportedOps = runnableOperations.filter(
-    (op): op is Exclude<OperationInProfile, Extract<OperationInProfile, { kind: "template" | "llm" }>> =>
-      op.kind !== "template" && op.kind !== "llm"
+    (op): op is Exclude<OperationInProfile, Extract<OperationInProfile, { kind: "template" | "llm" | "guard" }>> =>
+      op.kind !== "template" && op.kind !== "llm" && op.kind !== "guard"
   );
 
   const effectsByOpId = new Map<string, RuntimeEffect[]>();
@@ -472,6 +500,10 @@ export async function executeOperationsPhase(params: {
     string,
     { skipReason: OperationSkipReason; skipDetails?: OperationSkipDetails }
   >();
+  const runtimeSkippedMetaByTaskId = new Map<
+    string,
+    { skipReason: OperationSkipReason; skipDetails?: OperationSkipDetails }
+  >();
   const executableResults: OperationExecutionResult[] = [];
   if (executableOps.length > 0) {
     const orchestration = await runOrchestrator(
@@ -490,8 +522,22 @@ export async function executeOperationsPhase(params: {
           dependsOn: op.config.dependsOn,
           run: async () => {
             const depPreview = replayDependencyEffects(baseState, op.config.dependsOn ?? [], effectsByOpId);
+            const guardConditionResult = evaluateGuardRunConditions({
+              op,
+              operationsById,
+              artifacts: depPreview.artifacts,
+            });
+            if (!guardConditionResult.matched) {
+              runtimeSkippedMetaByTaskId.set(op.opId, {
+                skipReason: "guard_not_matched",
+                skipDetails: {
+                  guard: guardConditionResult.details,
+                },
+              });
+              throw createTaskSkip("runtime_condition", "guard_not_matched");
+            }
             const liquidContext = buildTemplateContext(params.templateContext, depPreview, params.operations);
-            let resolvedRendered = "";
+            let resolvedRendered: unknown = "";
             let debugSummary: string | undefined;
 
             if (op.kind === "template") {
@@ -514,6 +560,16 @@ export async function executeOperationsPhase(params: {
               debugSummary = llmResult.debugSummary;
             }
 
+            if (op.kind === "guard") {
+              const guardResult = await executeGuardOperation({
+                op,
+                liquidContext,
+                abortSignal: params.abortSignal,
+              });
+              resolvedRendered = guardResult.value;
+              debugSummary = guardResult.debugSummary;
+            }
+
             const artifact = op.config.params.artifact;
             const effects: RuntimeEffect[] = [
               {
@@ -543,7 +599,10 @@ export async function executeOperationsPhase(params: {
                 opId: op.opId,
                 name: op.name,
                 template: op.config.params.template,
-                rendered: resolvedRendered,
+                rendered:
+                  typeof resolvedRendered === "string"
+                    ? resolvedRendered
+                    : JSON.stringify(resolvedRendered),
                 effect,
                 liquidContext: buildLiquidContextSnapshot({
                   base: liquidContext,
@@ -557,13 +616,17 @@ export async function executeOperationsPhase(params: {
               effects,
               debugSummary:
                 debugSummary ??
-                `${getArtifactPrimaryEffectType(op.config.params.artifact)}:${resolvedRendered.length}`,
+                `${getArtifactPrimaryEffectType(op.config.params.artifact)}:${normalizeText(
+                  typeof resolvedRendered === "string"
+                    ? resolvedRendered
+                    : JSON.stringify(resolvedRendered)
+                ).length}`,
             });
             return {
               effects,
               debugSummary:
                 debugSummary ??
-                `${getArtifactPrimaryEffectType(op.config.params.artifact)}:${resolvedRendered.length}`,
+                `${getArtifactPrimaryEffectType(op.config.params.artifact)}:${normalizeText(resolvedRendered).length}`,
             };
           },
         })),
@@ -579,6 +642,13 @@ export async function executeOperationsPhase(params: {
           if (evt.type === "orch.task.skipped") {
             const op = executableOpsById.get(evt.data.taskId);
             if (!op) return;
+            if (evt.data.reason === "runtime_condition") {
+              const runtimeMeta = runtimeSkippedMetaByTaskId.get(op.opId);
+              if (runtimeMeta) {
+                skippedEventMetaByTaskId.set(op.opId, runtimeMeta);
+              }
+              return;
+            }
             const missingDeps =
               evt.data.reason === "dependency_missing"
                 ? (op.config.dependsOn ?? []).filter((depId) => !executableTaskIdSet.has(depId))
@@ -639,6 +709,7 @@ export async function executeOperationsPhase(params: {
             op,
             task,
             activationSkippedByOpId,
+            runtimeSkippedMetaByOpId: runtimeSkippedMetaByTaskId,
           });
         })
         .filter((item): item is OperationExecutionResult => Boolean(item))
diff --git a/server/src/services/chat-generation-v3/operations/guard-operation-executor.ts b/server/src/services/chat-generation-v3/operations/guard-operation-executor.ts
new file mode 100644
index 00000000..3d82b101
--- /dev/null
+++ b/server/src/services/chat-generation-v3/operations/guard-operation-executor.ts
@@ -0,0 +1,148 @@
+import { renderLiquidTemplate, type InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
+import { compileGuardOutputSchema, buildGuardOutputJsonSchemaSpec } from "../../operations/guard-output-contract";
+
+import { executeLlmOperation } from "./llm-operation-executor";
+
+import type { OperationInProfile } from "@shared/types/operation-profiles";
+
+type GuardOperation = Extract<OperationInProfile, { kind: "guard" }>;
+type LlmLikeOperation = Extract<OperationInProfile, { kind: "llm" }>;
+
+type CodedError = Error & { code: string };
+
+function createCodedError(code: string, message: string): CodedError {
+  const error = new Error(message) as CodedError;
+  error.code = code;
+  return error;
+}
+
+function mapGuardError(error: unknown): never {
+  if (error instanceof Error) {
+    const code = (error as Error & { code?: string }).code;
+    if (code === "LLM_TEMPLATE_RENDER_ERROR") {
+      throw createCodedError("GUARD_TEMPLATE_RENDER_ERROR", error.message);
+    }
+    if (code === "LLM_OUTPUT_PARSE_ERROR" || code === "LLM_OUTPUT_EXTRACT_ERROR") {
+      throw createCodedError("GUARD_OUTPUT_PARSE_ERROR", error.message);
+    }
+    if (code === "LLM_OUTPUT_SCHEMA_ERROR") {
+      throw createCodedError("GUARD_OUTPUT_VALIDATION_ERROR", error.message);
+    }
+    if (code === "LLM_TIMEOUT") {
+      throw createCodedError("GUARD_TIMEOUT", error.message);
+    }
+    if (code?.startsWith("LLM_")) {
+      throw createCodedError("GUARD_PROVIDER_ERROR", error.message);
+    }
+  }
+  throw createCodedError(
+    "GUARD_PROVIDER_ERROR",
+    error instanceof Error ? error.message : String(error)
+  );
+}
+
+function parseGuardJsonOutput(params: {
+  value: string;
+  op: GuardOperation;
+}): Record<string, boolean> {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(params.value);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw createCodedError("GUARD_OUTPUT_PARSE_ERROR", message);
+  }
+
+  const schema = compileGuardOutputSchema(params.op.config.params.outputContract);
+  const result = schema.safeParse(parsed);
+  if (!result.success) {
+    const issue = result.error.issues[0];
+    const path = issue?.path?.length ? issue.path.join(".") : "$";
+    throw createCodedError(
+      "GUARD_OUTPUT_VALIDATION_ERROR",
+      `Guard output validation failed at ${path}: ${issue?.message ?? "invalid output"}`
+    );
+  }
+  return result.data;
+}
+
+function buildLlmLikeGuardOperation(op: GuardOperation): LlmLikeOperation {
+  if (op.config.params.engine !== "aux_llm") {
+    throw createCodedError("GUARD_INVALID_PARAMS", "Expected aux_llm guard params");
+  }
+
+  return {
+    opId: op.opId,
+    name: op.name,
+    kind: "llm",
+    config: {
+      enabled: op.config.enabled,
+      required: op.config.required,
+      hooks: op.config.hooks,
+      triggers: op.config.triggers,
+      activation: op.config.activation,
+      order: op.config.order,
+      dependsOn: op.config.dependsOn,
+      runConditions: op.config.runConditions,
+      params: {
+        params: {
+          providerId: op.config.params.providerId,
+          credentialRef: op.config.params.credentialRef,
+          model: op.config.params.model,
+          system: op.config.params.system,
+          prompt: op.config.params.prompt,
+          strictVariables: op.config.params.strictVariables,
+          outputMode: "json",
+          jsonSchema: buildGuardOutputJsonSchemaSpec(op.config.params.outputContract),
+          strictSchemaValidation: true,
+          jsonParseMode: "raw",
+          samplers: op.config.params.samplers,
+          timeoutMs: op.config.params.timeoutMs,
+          retry: op.config.params.retry,
+        },
+        artifact: op.config.params.artifact,
+      },
+    },
+  };
+}
+
+export async function executeGuardOperation(params: {
+  op: GuardOperation;
+  liquidContext: InstructionRenderContext;
+  abortSignal?: AbortSignal;
+}): Promise<{ value: Record<string, boolean>; debugSummary: string }> {
+  if (params.op.config.params.engine === "liquid") {
+    let rendered = "";
+    try {
+      rendered = String(
+        await renderLiquidTemplate({
+          templateText: params.op.config.params.template,
+          context: params.liquidContext,
+          options: { strictVariables: Boolean(params.op.config.params.strictVariables) },
+        })
+      );
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw createCodedError("GUARD_TEMPLATE_RENDER_ERROR", message);
+    }
+
+    return {
+      value: parseGuardJsonOutput({ value: rendered, op: params.op }),
+      debugSummary: `guard:liquid:${params.op.config.params.outputContract.length}`,
+    };
+  }
+
+  try {
+    const llmResult = await executeLlmOperation({
+      op: buildLlmLikeGuardOperation(params.op),
+      liquidContext: params.liquidContext,
+      abortSignal: params.abortSignal,
+    });
+    return {
+      value: parseGuardJsonOutput({ value: llmResult.rendered, op: params.op }),
+      debugSummary: `guard:aux_llm:${params.op.config.params.outputContract.length}:${llmResult.debugSummary}`,
+    };
+  } catch (error) {
+    mapGuardError(error);
+  }
+}
diff --git a/server/src/services/chat-generation-v3/operations/guard-run-conditions.ts b/server/src/services/chat-generation-v3/operations/guard-run-conditions.ts
new file mode 100644
index 00000000..029883ea
--- /dev/null
+++ b/server/src/services/chat-generation-v3/operations/guard-run-conditions.ts
@@ -0,0 +1,66 @@
+import type { OperationSkipDetails } from "../contracts";
+import type { OperationInProfile } from "@shared/types/operation-profiles";
+
+type ArtifactSnapshot = { value: unknown; history: unknown[] };
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
+function readGuardOutputValue(params: {
+  sourceOp: Extract<OperationInProfile, { kind: "guard" }>;
+  artifacts: Record<string, ArtifactSnapshot>;
+  outputKey: string;
+}): boolean | null {
+  const artifact =
+    params.artifacts[params.sourceOp.config.params.artifact.tag] ??
+    params.artifacts[params.sourceOp.config.params.artifact.artifactId];
+  if (!artifact || !isRecord(artifact.value)) return null;
+  const value = artifact.value[params.outputKey];
+  return typeof value === "boolean" ? value : null;
+}
+
+export function evaluateGuardRunConditions(params: {
+  op: OperationInProfile;
+  operationsById: ReadonlyMap<string, OperationInProfile>;
+  artifacts: Record<string, ArtifactSnapshot>;
+}):
+  | { matched: true }
+  | { matched: false; details: NonNullable<OperationSkipDetails["guard"]> } {
+  for (const condition of params.op.config.runConditions ?? []) {
+    if (condition.type !== "guard_output") continue;
+    const sourceOp = params.operationsById.get(condition.sourceOpId);
+    if (!sourceOp || sourceOp.kind !== "guard") {
+      return {
+        matched: false,
+        details: {
+          sourceOpId: condition.sourceOpId,
+          outputKey: condition.outputKey,
+          operator: condition.operator,
+          actual: null,
+        },
+      };
+    }
+
+    const actual = readGuardOutputValue({
+      sourceOp,
+      artifacts: params.artifacts,
+      outputKey: condition.outputKey,
+    });
+    const matched =
+      condition.operator === "is_true" ? actual === true : actual === false;
+    if (!matched) {
+      return {
+        matched: false,
+        details: {
+          sourceOpId: condition.sourceOpId,
+          outputKey: condition.outputKey,
+          operator: condition.operator,
+          actual,
+        },
+      };
+    }
+  }
+
+  return { matched: true };
+}
diff --git a/server/src/services/operations/guard-operation-params.ts b/server/src/services/operations/guard-operation-params.ts
new file mode 100644
index 00000000..059ba983
--- /dev/null
+++ b/server/src/services/operations/guard-operation-params.ts
@@ -0,0 +1,133 @@
+import { z } from "zod";
+
+import type {
+  GuardAuxLlmParams,
+  GuardLiquidParams,
+  GuardOperationParams,
+  GuardOutputContract,
+  GuardOutputDefinition,
+  LlmOperationRetry,
+  LlmOperationRetryOn,
+  LlmOperationSamplers,
+} from "@shared/types/operation-profiles";
+
+const guardOutputKeySchema = z
+  .string()
+  .trim()
+  .min(1)
+  .regex(/^[a-z][a-zA-Z0-9_]*$/, "guard output key must match ^[a-z][a-zA-Z0-9_]*$");
+
+const guardOutputDefinitionSchema: z.ZodType<GuardOutputDefinition> = z.object({
+  key: guardOutputKeySchema,
+  title: z.string().trim().min(1),
+  description: z.string().trim().min(1).optional(),
+});
+
+export const guardOutputContractSchema: z.ZodType<GuardOutputContract> = z
+  .array(guardOutputDefinitionSchema)
+  .min(1)
+  .superRefine((items, ctx) => {
+    const seen = new Set<string>();
+    for (const item of items) {
+      if (seen.has(item.key)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `duplicate guard output key: ${item.key}`,
+          path: ["key"],
+        });
+      }
+      seen.add(item.key);
+    }
+  });
+
+const retryOnSchema = z.enum(["timeout", "provider_error", "rate_limit"] satisfies LlmOperationRetryOn[]);
+const reasoningEffortSchema = z.enum(["low", "medium", "high"]);
+
+const samplersSchema: z.ZodType<LlmOperationSamplers> = z
+  .object({
+    temperature: z.number().finite().optional(),
+    topP: z.number().finite().optional(),
+    topK: z.number().finite().optional(),
+    minP: z.number().finite().optional(),
+    topA: z.number().finite().optional(),
+    frequencyPenalty: z.number().finite().optional(),
+    presencePenalty: z.number().finite().optional(),
+    repetitionPenalty: z.number().finite().optional(),
+    seed: z.number().finite().optional(),
+    maxTokens: z.number().finite().optional(),
+    reasoning: z
+      .object({
+        enabled: z.boolean().optional(),
+        effort: reasoningEffortSchema.optional(),
+        maxTokens: z.number().finite().optional(),
+        exclude: z.boolean().optional(),
+      })
+      .strict()
+      .optional(),
+  })
+  .strict();
+
+const retrySchema: z.ZodType<LlmOperationRetry> = z
+  .object({
+    maxAttempts: z.number().int().min(1).max(10),
+    backoffMs: z.number().int().min(0).max(120_000).optional(),
+    retryOn: z.array(retryOnSchema).min(1).optional(),
+  })
+  .strict();
+
+export const liquidGuardParamsSchema = z
+  .object({
+    engine: z.literal("liquid"),
+    outputContract: guardOutputContractSchema,
+    template: z.string(),
+    strictVariables: z.boolean().optional(),
+  })
+  .strict();
+
+export const auxLlmGuardParamsSchema = z
+  .object({
+    engine: z.literal("aux_llm"),
+    outputContract: guardOutputContractSchema,
+    providerId: z.enum(["openrouter", "openai_compatible"]),
+    credentialRef: z.string().trim().min(1),
+    model: z.string().trim().min(1).optional(),
+    system: z.string().optional(),
+    prompt: z.string().min(1),
+    strictVariables: z.boolean().optional(),
+    samplers: samplersSchema.optional(),
+    timeoutMs: z.number().int().min(1).max(300_000).optional(),
+    retry: retrySchema.optional(),
+  })
+  .strict();
+
+export const guardOperationParamsSchema = z.discriminatedUnion("engine", [
+  liquidGuardParamsSchema,
+  auxLlmGuardParamsSchema,
+]);
+
+export type NormalizedGuardOperationParams =
+  | (Omit<GuardLiquidParams, "artifact" | "strictVariables"> & {
+      strictVariables: boolean;
+    })
+  | (Omit<GuardAuxLlmParams, "artifact" | "strictVariables"> & {
+      strictVariables: boolean;
+    });
+
+export function parseGuardOperationParams(
+  raw: unknown
+): NormalizedGuardOperationParams {
+  const parsed = guardOperationParamsSchema.parse(raw) as Omit<GuardOperationParams, "artifact">;
+  if (parsed.engine === "liquid") {
+    const liquid = parsed as Omit<GuardLiquidParams, "artifact">;
+    return {
+      ...liquid,
+      strictVariables: liquid.strictVariables === true,
+    };
+  }
+
+  const aux = parsed as Omit<GuardAuxLlmParams, "artifact">;
+  return {
+    ...aux,
+    strictVariables: aux.strictVariables === true,
+  };
+}
diff --git a/server/src/services/operations/guard-output-contract.ts b/server/src/services/operations/guard-output-contract.ts
new file mode 100644
index 00000000..91a15ab2
--- /dev/null
+++ b/server/src/services/operations/guard-output-contract.ts
@@ -0,0 +1,28 @@
+import { z } from "zod";
+
+import type {
+  GuardOutputContract,
+  GuardOutputDefinition,
+} from "@shared/types/operation-profiles";
+
+function toShape(contract: GuardOutputContract): Record<string, z.ZodBoolean> {
+  return Object.fromEntries(
+    contract.map((item) => [item.key, z.boolean()])
+  );
+}
+
+export function compileGuardOutputSchema(contract: GuardOutputContract): z.ZodType<Record<string, boolean>> {
+  return z.object(toShape(contract)).strict();
+}
+
+export function buildGuardOutputJsonSchemaSpec(contract: GuardOutputContract): Record<string, string> {
+  return Object.fromEntries(contract.map((item) => [item.key, "boolean"]));
+}
+
+export function normalizeGuardOutputContract(contract: GuardOutputDefinition[]): GuardOutputContract {
+  return contract.map((item) => ({
+    key: item.key,
+    title: item.title,
+    description: item.description,
+  }));
+}
diff --git a/server/src/services/operations/operation-block-validator.test.ts b/server/src/services/operations/operation-block-validator.test.ts
index 08a9118f..a78cf813 100644
--- a/server/src/services/operations/operation-block-validator.test.ts
+++ b/server/src/services/operations/operation-block-validator.test.ts
@@ -241,5 +241,283 @@ describe("operation block validator", () => {
       })
     ).toThrow(/before_main_llm/i);
   });
+
+  test("accepts valid guard with run condition consumer", () => {
+    const out = validateOperationBlockUpsertInput({
+      name: "block",
+      enabled: true,
+      operations: [
+        {
+          opId: "11111111-1111-4111-8111-111111111111",
+          name: "combat-guard",
+          kind: "guard",
+          config: {
+            enabled: true,
+            required: false,
+            hooks: ["before_main_llm"],
+            order: 10,
+            params: {
+              engine: "liquid",
+              outputContract: [
+                { key: "isBattle", title: "Battle" },
+                { key: "isNight", title: "Night" },
+              ],
+              template: "{\"isBattle\": true, \"isNight\": false}",
+              artifact: {
+                artifactId: "artifact:11111111-1111-4111-8111-111111111111",
+                tag: "combat_guard_state",
+                title: "Combat guard state",
+                format: "json",
+                persistence: "run_only",
+                writeMode: "replace",
+                history: {
+                  enabled: true,
+                  maxItems: 20,
+                },
+                exposures: [],
+              },
+            },
+          },
+        },
+        {
+          opId: "22222222-2222-4222-8222-222222222222",
+          name: "combat-consumer",
+          kind: "template",
+          config: {
+            enabled: true,
+            required: false,
+            hooks: ["before_main_llm"],
+            order: 20,
+            dependsOn: ["11111111-1111-4111-8111-111111111111"],
+            runConditions: [
+              {
+                type: "guard_output",
+                sourceOpId: "11111111-1111-4111-8111-111111111111",
+                outputKey: "isBattle",
+                operator: "is_true",
+              },
+            ],
+            params: {
+              template: "combat",
+              artifact: {
+                artifactId: "artifact:22222222-2222-4222-8222-222222222222",
+                tag: "combat_text",
+                title: "Combat text",
+                format: "markdown",
+                persistence: "run_only",
+                writeMode: "replace",
+                history: {
+                  enabled: true,
+                  maxItems: 20,
+                },
+                exposures: [],
+              },
+            },
+          },
+        },
+      ],
+    });
+
+    expect(out.operations[0]?.kind).toBe("guard");
+    expect(out.operations[1]?.config.runConditions).toEqual([
+      {
+        type: "guard_output",
+        sourceOpId: "11111111-1111-4111-8111-111111111111",
+        outputKey: "isBattle",
+        operator: "is_true",
+      },
+    ]);
+  });
+
+  test("rejects guard with non-json artifact format", () => {
+    expect(() =>
+      validateOperationBlockUpsertInput({
+        name: "block",
+        enabled: true,
+        operations: [
+          {
+            opId: "11111111-1111-4111-8111-111111111111",
+            name: "combat-guard",
+            kind: "guard",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["before_main_llm"],
+              order: 10,
+              params: {
+                engine: "liquid",
+                outputContract: [{ key: "isBattle", title: "Battle" }],
+                template: "{\"isBattle\": true}",
+                artifact: {
+                  artifactId: "artifact:11111111-1111-4111-8111-111111111111",
+                  tag: "combat_guard_state",
+                  title: "Combat guard state",
+                  format: "markdown",
+                  persistence: "run_only",
+                  writeMode: "replace",
+                  history: {
+                    enabled: true,
+                    maxItems: 20,
+                  },
+                  exposures: [],
+                },
+              },
+            },
+          },
+        ],
+      })
+    ).toThrow(/guard artifact format/i);
+  });
+
+  test("rejects run condition with unknown output key", () => {
+    expect(() =>
+      validateOperationBlockUpsertInput({
+        name: "block",
+        enabled: true,
+        operations: [
+          {
+            opId: "11111111-1111-4111-8111-111111111111",
+            name: "combat-guard",
+            kind: "guard",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["before_main_llm"],
+              order: 10,
+              params: {
+                engine: "liquid",
+                outputContract: [{ key: "isBattle", title: "Battle" }],
+                template: "{\"isBattle\": true}",
+                artifact: {
+                  artifactId: "artifact:11111111-1111-4111-8111-111111111111",
+                  tag: "combat_guard_state",
+                  title: "Combat guard state",
+                  format: "json",
+                  persistence: "run_only",
+                  writeMode: "replace",
+                  history: {
+                    enabled: true,
+                    maxItems: 20,
+                  },
+                  exposures: [],
+                },
+              },
+            },
+          },
+          {
+            opId: "22222222-2222-4222-8222-222222222222",
+            name: "consumer",
+            kind: "template",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["before_main_llm"],
+              order: 20,
+              dependsOn: ["11111111-1111-4111-8111-111111111111"],
+              runConditions: [
+                {
+                  type: "guard_output",
+                  sourceOpId: "11111111-1111-4111-8111-111111111111",
+                  outputKey: "missingFlag",
+                  operator: "is_true",
+                },
+              ],
+              params: {
+                template: "Hello",
+                artifact: {
+                  artifactId: "artifact:22222222-2222-4222-8222-222222222222",
+                  tag: "consumer_state",
+                  title: "Consumer state",
+                  format: "markdown",
+                  persistence: "run_only",
+                  writeMode: "replace",
+                  history: {
+                    enabled: true,
+                    maxItems: 20,
+                  },
+                  exposures: [],
+                },
+              },
+            },
+          },
+        ],
+      })
+    ).toThrow(/runCondition references unknown guard output/i);
+  });
+
+  test("rejects run condition without matching dependsOn", () => {
+    expect(() =>
+      validateOperationBlockUpsertInput({
+        name: "block",
+        enabled: true,
+        operations: [
+          {
+            opId: "11111111-1111-4111-8111-111111111111",
+            name: "combat-guard",
+            kind: "guard",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["before_main_llm"],
+              order: 10,
+              params: {
+                engine: "liquid",
+                outputContract: [{ key: "isBattle", title: "Battle" }],
+                template: "{\"isBattle\": true}",
+                artifact: {
+                  artifactId: "artifact:11111111-1111-4111-8111-111111111111",
+                  tag: "combat_guard_state",
+                  title: "Combat guard state",
+                  format: "json",
+                  persistence: "run_only",
+                  writeMode: "replace",
+                  history: {
+                    enabled: true,
+                    maxItems: 20,
+                  },
+                  exposures: [],
+                },
+              },
+            },
+          },
+          {
+            opId: "22222222-2222-4222-8222-222222222222",
+            name: "consumer",
+            kind: "template",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["before_main_llm"],
+              order: 20,
+              runConditions: [
+                {
+                  type: "guard_output",
+                  sourceOpId: "11111111-1111-4111-8111-111111111111",
+                  outputKey: "isBattle",
+                  operator: "is_true",
+                },
+              ],
+              params: {
+                template: "Hello",
+                artifact: {
+                  artifactId: "artifact:22222222-2222-4222-8222-222222222222",
+                  tag: "consumer_state",
+                  title: "Consumer state",
+                  format: "markdown",
+                  persistence: "run_only",
+                  writeMode: "replace",
+                  history: {
+                    enabled: true,
+                    maxItems: 20,
+                  },
+                  exposures: [],
+                },
+              },
+            },
+          },
+        ],
+      })
+    ).toThrow(/runCondition sourceOpId must also appear in dependsOn/i);
+  });
 });
 
diff --git a/server/src/services/operations/operation-block-validator.ts b/server/src/services/operations/operation-block-validator.ts
index 06648353..faceff99 100644
--- a/server/src/services/operations/operation-block-validator.ts
+++ b/server/src/services/operations/operation-block-validator.ts
@@ -12,6 +12,7 @@ import {
   type OperationInProfile,
   type OperationKind,
   type OperationProfile,
+  type OperationRunCondition,
   type OperationTemplateParams,
   type OperationTrigger,
   type PromptTimeMessageRole,
@@ -22,6 +23,12 @@ import { HttpError } from "@core/middleware/error-handler";
 
 import { validateLiquidTemplate } from "../chat-core/prompt-template-renderer";
 
+import {
+  auxLlmGuardParamsSchema,
+  guardOperationParamsSchema,
+  liquidGuardParamsSchema,
+} from "./guard-operation-params";
+import { compileGuardOutputSchema } from "./guard-output-contract";
 import { compileLlmJsonSchemaSpec } from "./llm-json-schema-spec";
 import { llmOperationParamsSchema } from "./llm-operation-params";
 
@@ -183,6 +190,19 @@ const otherKindParamsSchema = z.object({
   output: legacyOperationOutputSchema.optional(),
 });
 
+const runConditionSchema: z.ZodType<OperationRunCondition> = z.discriminatedUnion("type", [
+  z.object({
+    type: z.literal("guard_output"),
+    sourceOpId: uuidSchema,
+    outputKey: z
+      .string()
+      .trim()
+      .min(1)
+      .regex(/^[a-z][a-zA-Z0-9_]*$/, "guard output key must match ^[a-z][a-zA-Z0-9_]*$"),
+    operator: z.enum(["is_true", "is_false"]),
+  }),
+]);
+
 const operationConfigBaseSchema = z.object({
   enabled: z.boolean(),
   required: z.boolean(),
@@ -191,6 +211,7 @@ const operationConfigBaseSchema = z.object({
   activation: operationActivationSchema.optional(),
   order: z.number().finite(),
   dependsOn: z.array(uuidSchema).optional(),
+  runConditions: z.array(runConditionSchema).optional(),
 });
 
 const operationConfigTemplateSchema = operationConfigBaseSchema.extend({
@@ -209,6 +230,17 @@ const operationConfigLlmSchema = operationConfigBaseSchema.extend({
   }),
 });
 
+const operationConfigGuardSchema = operationConfigBaseSchema.extend({
+  params: z.discriminatedUnion("engine", [
+    liquidGuardParamsSchema.extend({
+      artifact: artifactConfigSchema.optional(),
+    }),
+    auxLlmGuardParamsSchema.extend({
+      artifact: artifactConfigSchema.optional(),
+    }),
+  ]),
+});
+
 export const operationInProfileSchema: z.ZodType<OperationInProfile> = z
   .discriminatedUnion("kind", [
     z.object({
@@ -225,6 +257,13 @@ export const operationInProfileSchema: z.ZodType<OperationInProfile> = z
       kind: z.literal("llm"),
       config: operationConfigLlmSchema,
     }),
+    z.object({
+      opId: uuidSchema,
+      name: z.string().trim().min(1),
+      description: z.string().trim().min(1).optional(),
+      kind: z.literal("guard"),
+      config: operationConfigGuardSchema,
+    }),
     z.object({
       opId: uuidSchema,
       name: z.string().trim().min(1),
@@ -235,7 +274,7 @@ export const operationInProfileSchema: z.ZodType<OperationInProfile> = z
         "compute",
         "transform",
         "legacy",
-      ] satisfies Exclude<OperationKind, "template" | "llm">[]),
+      ] satisfies Exclude<OperationKind, "template" | "llm" | "guard">[]),
       config: operationConfigOtherSchema,
     }),
   ])
@@ -256,6 +295,11 @@ export const operationInProfileSchema: z.ZodType<OperationInProfile> = z
               strictVariables: op.config.params.strictVariables,
               artifact,
             }
+          : op.kind === "guard"
+            ? {
+                ...op.config.params,
+                artifact,
+              }
           : {
               params: op.config.params.params,
               artifact,
@@ -297,6 +341,21 @@ function normalizeDependsOn(dependsOn: string[] | undefined): string[] | undefin
   return Array.from(new Set(dependsOn));
 }
 
+function normalizeRunConditions(
+  runConditions: OperationRunCondition[] | undefined
+): OperationRunCondition[] | undefined {
+  if (!runConditions?.length) return undefined;
+  const seen = new Set<string>();
+  const normalized: OperationRunCondition[] = [];
+  for (const condition of runConditions) {
+    const key = `${condition.type}:${condition.sourceOpId}:${condition.outputKey}:${condition.operator}`;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    normalized.push(condition);
+  }
+  return normalized.length > 0 ? normalized : undefined;
+}
+
 function normalizeActivation(
   activation: OperationActivationConfig | undefined
 ): OperationActivationConfig | undefined {
@@ -429,6 +488,54 @@ function validateCrossRules(input: ValidatedOperationBlockInput): void {
       }
     }
 
+    for (const condition of op.config.runConditions ?? []) {
+      if (condition.type !== "guard_output") continue;
+      if (!opIds.has(condition.sourceOpId)) {
+        throw new HttpError(400, "runCondition references unknown opId", "VALIDATION_ERROR", {
+          opId: op.opId,
+          sourceOpId: condition.sourceOpId,
+        });
+      }
+      if (!(op.config.dependsOn ?? []).includes(condition.sourceOpId)) {
+        throw new HttpError(
+          400,
+          "runCondition sourceOpId must also appear in dependsOn",
+          "VALIDATION_ERROR",
+          {
+            opId: op.opId,
+            sourceOpId: condition.sourceOpId,
+          }
+        );
+      }
+
+      const sourceOp = opsById.get(condition.sourceOpId);
+      if (!sourceOp || sourceOp.kind !== "guard") {
+        throw new HttpError(
+          400,
+          "runCondition sourceOpId must reference guard operation",
+          "VALIDATION_ERROR",
+          {
+            opId: op.opId,
+            sourceOpId: condition.sourceOpId,
+          }
+        );
+      }
+
+      const outputKeys = new Set(sourceOp.config.params.outputContract.map((item) => item.key));
+      if (!outputKeys.has(condition.outputKey)) {
+        throw new HttpError(
+          400,
+          "runCondition references unknown guard output",
+          "VALIDATION_ERROR",
+          {
+            opId: op.opId,
+            sourceOpId: condition.sourceOpId,
+            outputKey: condition.outputKey,
+          }
+        );
+      }
+    }
+
     if (op.kind === "template") {
       try {
         validateLiquidTemplate((op.config.params as OperationTemplateParams).template);
@@ -499,6 +606,68 @@ function validateCrossRules(input: ValidatedOperationBlockInput): void {
       }
     }
 
+    if (op.kind === "guard") {
+      const { artifact: _artifact, ...rawGuardParams } = op.config.params;
+      const guardParams = guardOperationParamsSchema.parse(rawGuardParams);
+      try {
+        compileGuardOutputSchema(guardParams.outputContract);
+      } catch (error) {
+        throw new HttpError(
+          400,
+          `Guard output contract is invalid: ${error instanceof Error ? error.message : String(error)}`,
+          "VALIDATION_ERROR",
+          { opId: op.opId }
+        );
+      }
+
+      if (op.config.params.artifact.format !== "json") {
+        throw new HttpError(
+          400,
+          "Guard artifact format must be json",
+          "VALIDATION_ERROR",
+          { opId: op.opId }
+        );
+      }
+
+      if (guardParams.engine === "liquid") {
+        try {
+          validateLiquidTemplate(guardParams.template);
+        } catch (error) {
+          throw new HttpError(
+            400,
+            `Guard template не компилируется: ${error instanceof Error ? error.message : String(error)}`,
+            "VALIDATION_ERROR",
+            { opId: op.opId }
+          );
+        }
+      }
+
+      if (guardParams.engine === "aux_llm") {
+        try {
+          validateLiquidTemplate(guardParams.prompt);
+        } catch (error) {
+          throw new HttpError(
+            400,
+            `Guard prompt template не компилируется: ${error instanceof Error ? error.message : String(error)}`,
+            "VALIDATION_ERROR",
+            { opId: op.opId }
+          );
+        }
+        if (typeof guardParams.system === "string" && guardParams.system.length > 0) {
+          try {
+            validateLiquidTemplate(guardParams.system);
+          } catch (error) {
+            throw new HttpError(
+              400,
+              `Guard system template не компилируется: ${error instanceof Error ? error.message : String(error)}`,
+              "VALIDATION_ERROR",
+              { opId: op.opId }
+            );
+          }
+        }
+      }
+    }
+
     const existingArtifactId = artifactIds.get(op.config.params.artifact.artifactId);
     if (existingArtifactId) {
       throw new HttpError(400, "Duplicate artifactId in block", "VALIDATION_ERROR", {
@@ -540,6 +709,7 @@ export function validateOperationBlockUpsertInput(raw: unknown): ValidatedOperat
       triggers: normalizeTriggers(op.config.triggers),
       activation: normalizeActivation(op.config.activation),
       dependsOn: normalizeDependsOn(op.config.dependsOn),
+      runConditions: normalizeRunConditions(op.config.runConditions),
     };
     return { ...op, config: normalizedConfig } as OperationInProfile;
   });
diff --git a/server/src/services/operations/operation-profile-resolver.test.ts b/server/src/services/operations/operation-profile-resolver.test.ts
index 634db253..d1bdd85c 100644
--- a/server/src/services/operations/operation-profile-resolver.test.ts
+++ b/server/src/services/operations/operation-profile-resolver.test.ts
@@ -20,6 +20,7 @@ function makeBlock(params: {
   version: number;
   order: number;
   artifactTag?: string;
+  withGuardConsumer?: boolean;
 }): OperationBlock {
   const now = new Date();
   return {
@@ -28,39 +29,118 @@ function makeBlock(params: {
     name: params.blockId,
     enabled: true,
     version: params.version,
-    operations: [
-      {
-        opId: "op-1e6df0d9-2d3a-420f-83f0-a4e90ca1b056",
-        name: "op",
-        kind: "template",
-        config: {
-          enabled: true,
-          required: false,
-          hooks: ["before_main_llm"],
-          order: params.order,
-          dependsOn: [],
-          params: {
-            template: "hello",
-            artifact: normalizeOperationArtifactConfig({
-              opId: "op-1e6df0d9-2d3a-420f-83f0-a4e90ca1b056",
-              kind: "template",
-              title: "op",
-              rawParams: {
-                output: {
-                  type: "artifacts",
-                    writeArtifact: {
-                      tag: params.artifactTag ?? `block_${params.blockId.replace(/-/g, "_")}_state`,
+    operations: params.withGuardConsumer
+      ? [
+          {
+            opId: "11111111-1111-4111-8111-111111111111",
+            name: "guard",
+            kind: "guard",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["before_main_llm"],
+              order: params.order,
+              dependsOn: [],
+              params: {
+                engine: "liquid",
+                outputContract: [{ key: "isBattle", title: "Battle" }],
+                template: "{\"isBattle\": true}",
+                artifact: normalizeOperationArtifactConfig({
+                  opId: "11111111-1111-4111-8111-111111111111",
+                  kind: "guard",
+                  title: "guard",
+                  rawParams: {
+                    artifact: {
+                      artifactId: "artifact:11111111-1111-4111-8111-111111111111",
+                      tag: `block_${params.blockId.replace(/-/g, "_")}_guard`,
+                      title: "Guard state",
+                      format: "json",
                       persistence: "run_only",
-                      usage: "internal",
-                      semantics: "intermediate",
+                      writeMode: "replace",
+                      history: {
+                        enabled: true,
+                        maxItems: 20,
+                      },
+                      exposures: [],
                     },
-                } satisfies LegacyOperationOutput,
+                  },
+                }),
               },
-            }),
+            },
           },
-        },
-      },
-    ],
+          {
+            opId: "22222222-2222-4222-8222-222222222222",
+            name: "consumer",
+            kind: "template",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["before_main_llm"],
+              order: params.order + 1,
+              dependsOn: ["11111111-1111-4111-8111-111111111111"],
+              runConditions: [
+                {
+                  type: "guard_output",
+                  sourceOpId: "11111111-1111-4111-8111-111111111111",
+                  outputKey: "isBattle",
+                  operator: "is_true",
+                },
+              ],
+              params: {
+                template: "hello",
+                artifact: normalizeOperationArtifactConfig({
+                  opId: "22222222-2222-4222-8222-222222222222",
+                  kind: "template",
+                  title: "consumer",
+                  rawParams: {
+                    output: {
+                      type: "artifacts",
+                      writeArtifact: {
+                        tag: params.artifactTag ?? `block_${params.blockId.replace(/-/g, "_")}_state`,
+                        persistence: "run_only",
+                        usage: "internal",
+                        semantics: "intermediate",
+                      },
+                    } satisfies LegacyOperationOutput,
+                  },
+                }),
+              },
+            },
+          },
+        ]
+      : [
+          {
+            opId: "op-1e6df0d9-2d3a-420f-83f0-a4e90ca1b056",
+            name: "op",
+            kind: "template",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["before_main_llm"],
+              order: params.order,
+              dependsOn: [],
+              params: {
+                template: "hello",
+                artifact: normalizeOperationArtifactConfig({
+                  opId: "op-1e6df0d9-2d3a-420f-83f0-a4e90ca1b056",
+                  kind: "template",
+                  title: "op",
+                  rawParams: {
+                    output: {
+                      type: "artifacts",
+                      writeArtifact: {
+                        tag: params.artifactTag ?? `block_${params.blockId.replace(/-/g, "_")}_state`,
+                        persistence: "run_only",
+                        usage: "internal",
+                        semantics: "intermediate",
+                      },
+                    } satisfies LegacyOperationOutput,
+                  },
+                }),
+              },
+            },
+          },
+        ],
     meta: null,
     createdAt: now,
     updatedAt: now,
@@ -174,4 +254,42 @@ describe("operation profile resolver", () => {
       /duplicate artifact (tag|id) in compiled profile/i
     );
   });
+
+  test("prefixes guard run condition source ids when flattening block operations", async () => {
+    blockById.clear();
+    blockById.set("11111111-1111-4111-8111-111111111111", makeBlock({
+      blockId: "11111111-1111-4111-8111-111111111111",
+      version: 1,
+      order: 10,
+      withGuardConsumer: true,
+    }));
+
+    const now = new Date();
+    const profile: OperationProfile = {
+      profileId: "profile-guard",
+      ownerId: "global",
+      name: "guard",
+      enabled: true,
+      executionMode: "sequential",
+      operationProfileSessionId: "sess-guard",
+      version: 1,
+      blockRefs: [
+        { blockId: "11111111-1111-4111-8111-111111111111", enabled: true, order: 10 },
+      ],
+      meta: null,
+      createdAt: now,
+      updatedAt: now,
+    };
+
+    const out = await resolveCompiledOperationProfile(profile);
+    const consumer = out.operations.find((item) => item.kind === "template" && item.name === "consumer");
+    expect(consumer?.config.runConditions).toEqual([
+      {
+        type: "guard_output",
+        sourceOpId: "11111111-1111-4111-8111-111111111111:11111111-1111-4111-8111-111111111111",
+        outputKey: "isBattle",
+        operator: "is_true",
+      },
+    ]);
+  });
 });
diff --git a/server/src/services/operations/operation-profile-resolver.ts b/server/src/services/operations/operation-profile-resolver.ts
index dc71d9c3..34b9dc1a 100644
--- a/server/src/services/operations/operation-profile-resolver.ts
+++ b/server/src/services/operations/operation-profile-resolver.ts
@@ -35,6 +35,14 @@ function mapOperationToRuntime(params: {
   const blockPrefix = `${params.blockId}:`;
   const opId = `${blockPrefix}${params.op.opId}`;
   const dependsOn = params.op.config.dependsOn?.map((dep) => `${blockPrefix}${dep}`);
+  const runConditions = params.op.config.runConditions?.map((condition) =>
+    condition.type === "guard_output"
+      ? {
+          ...condition,
+          sourceOpId: `${blockPrefix}${condition.sourceOpId}`,
+        }
+      : condition
+  );
   const order = params.blockOrderIndex * ORDER_BUCKET + normalizeOrder(params.op.config.order);
   const artifact: OperationArtifactConfig = {
     ...params.op.config.params.artifact,
@@ -47,6 +55,7 @@ function mapOperationToRuntime(params: {
       ...params.op.config,
       order,
       dependsOn: dependsOn?.length ? dependsOn : undefined,
+      runConditions: runConditions?.length ? runConditions : undefined,
       params:
         params.op.kind === "template"
           ? {
diff --git a/shared/types/operation-profiles.ts b/shared/types/operation-profiles.ts
index be5893f2..4c02601d 100644
--- a/shared/types/operation-profiles.ts
+++ b/shared/types/operation-profiles.ts
@@ -17,6 +17,7 @@ export type ArtifactSemantics =
 export type OperationKind =
   | "template"
   | "llm"
+  | "guard"
   | "rag"
   | "tool"
   | "compute"
@@ -196,6 +197,41 @@ export type LlmOperationParams = {
   retry?: LlmOperationRetry;
 };
 
+export type GuardEngine = "liquid" | "aux_llm";
+
+export type GuardOutputDefinition = {
+  key: string;
+  title: string;
+  description?: string;
+};
+
+export type GuardOutputContract = GuardOutputDefinition[];
+
+export type GuardLiquidParams = {
+  engine: "liquid";
+  outputContract: GuardOutputContract;
+  template: string;
+  strictVariables?: boolean;
+  artifact: OperationArtifactConfig;
+};
+
+export type GuardAuxLlmParams = {
+  engine: "aux_llm";
+  outputContract: GuardOutputContract;
+  providerId: "openrouter" | "openai_compatible";
+  credentialRef: string;
+  model?: string;
+  system?: string;
+  prompt: string;
+  strictVariables?: boolean;
+  samplers?: LlmOperationSamplers;
+  timeoutMs?: number;
+  retry?: LlmOperationRetry;
+  artifact: OperationArtifactConfig;
+};
+
+export type GuardOperationParams = GuardLiquidParams | GuardAuxLlmParams;
+
 export type OperationOtherKindParams<TParams extends Record<string, unknown> = Record<string, unknown>> = {
   params: TParams;
   artifact: OperationArtifactConfig;
@@ -206,7 +242,26 @@ export type OperationOtherKindLegacyParams<TParams extends Record<string, unknow
   output: LegacyOperationOutput;
 };
 
-export type OperationParams = OperationTemplateParams | OperationOtherKindParams;
+export type OperationRunCondition =
+  | {
+      type: "guard_output";
+      sourceOpId: string;
+      outputKey: string;
+      operator: "is_true";
+    }
+  | {
+      type: "guard_output";
+      sourceOpId: string;
+      outputKey: string;
+      operator: "is_false";
+    };
+
+export type OperationParams =
+  | OperationTemplateParams
+  | OperationGuardOperationParamsCompat
+  | OperationOtherKindParams;
+
+type OperationGuardOperationParamsCompat = GuardOperationParams;
 
 export type OperationActivationConfig = {
   everyNTurns?: number;
@@ -221,6 +276,7 @@ export type OperationConfig<TParams extends OperationParams = OperationParams> =
   activation?: OperationActivationConfig;
   order: number;
   dependsOn?: string[];
+  runConditions?: OperationRunCondition[];
   params: TParams;
 };
 
@@ -240,16 +296,25 @@ export type LlmOperationInProfile = {
   config: OperationConfig<OperationOtherKindParams<LlmOperationParams>>;
 };
 
+export type GuardOperationInProfile = {
+  opId: string;
+  name: string;
+  description?: string;
+  kind: "guard";
+  config: OperationConfig<GuardOperationParams>;
+};
+
 export type GenericNonTemplateOperationInProfile = {
   opId: string;
   name: string;
   description?: string;
-  kind: Exclude<OperationKind, "template" | "llm">;
+  kind: Exclude<OperationKind, "template" | "llm" | "guard">;
   config: OperationConfig<OperationOtherKindParams>;
 };
 
 export type NonTemplateOperationInProfile =
   | LlmOperationInProfile
+  | GuardOperationInProfile
   | GenericNonTemplateOperationInProfile;
 
 export type OperationInProfile = TemplateOperationInProfile | NonTemplateOperationInProfile;
@@ -413,6 +478,7 @@ export function inferDefaultArtifactFormat(params: {
   kind: OperationKind;
   llmOutputMode?: "text" | "json";
 }): ArtifactFormat {
+  if (params.kind === "guard") return "json";
   if (params.kind === "llm" && params.llmOutputMode === "json") return "json";
   return "markdown";
 }
diff --git a/web/src/features/sidebars/operation-profiles/form/guard-kind-form.ts b/web/src/features/sidebars/operation-profiles/form/guard-kind-form.ts
new file mode 100644
index 00000000..baee638d
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/form/guard-kind-form.ts
@@ -0,0 +1,177 @@
+import {
+	makeDefaultOperationArtifactConfig,
+	normalizeOperationArtifactConfig,
+	type GuardOutputContract,
+	type GuardOutputDefinition,
+	type GuardOperationInProfile,
+	type LlmOperationParams,
+	type LlmOperationRetryOn,
+	type LlmOperationSamplers,
+	type OperationArtifactConfig,
+} from '@shared/types/operation-profiles';
+
+import { normalizeRetryOn, pickNumericSamplers } from './operation-llm-form-utils';
+
+export type FormGuardKindParams = {
+	engine: 'liquid' | 'aux_llm';
+	outputContract: GuardOutputContract;
+	template: string;
+	providerId: LlmOperationParams['providerId'];
+	credentialRef: string;
+	model: string;
+	system: string;
+	prompt: string;
+	strictVariables: boolean;
+	samplers: LlmOperationSamplers;
+	timeoutMs: number;
+	retry: {
+		maxAttempts: number;
+		backoffMs: number;
+		retryOn: LlmOperationRetryOn[];
+	};
+	artifact: OperationArtifactConfig;
+};
+
+export function makeDefaultGuardOutputDefinition(index = 0): GuardOutputDefinition {
+	const humanIndex = index + 1;
+	return {
+		key: `branch_${humanIndex}`,
+		title: `Branch ${humanIndex}`,
+	};
+}
+
+function normalizeOutputContract(value: unknown): GuardOutputDefinition[] {
+	if (!Array.isArray(value)) return [];
+	return value.flatMap((item) => {
+		if (!item || typeof item !== 'object') return [];
+		const candidate = item as Record<string, unknown>;
+		const key = typeof candidate.key === 'string' ? candidate.key.trim() : '';
+		if (!key) return [];
+		return [
+			{
+				key,
+				title: typeof candidate.title === 'string' && candidate.title.trim() ? candidate.title.trim() : key,
+				description:
+					typeof candidate.description === 'string' && candidate.description.trim() ? candidate.description.trim() : undefined,
+			} satisfies GuardOutputDefinition,
+		];
+	});
+}
+
+export function readGuardOutputContract(params: unknown): GuardOutputDefinition[] {
+	if (!params || typeof params !== 'object') return [];
+	return normalizeOutputContract((params as Record<string, unknown>).outputContract);
+}
+
+export function makeDefaultGuardKindParams(
+	opId: string,
+	artifact: OperationArtifactConfig = makeDefaultOperationArtifactConfig({
+		opId,
+		kind: 'guard',
+		title: 'Artifact',
+	}),
+): FormGuardKindParams {
+	return {
+		engine: 'liquid',
+		outputContract: [makeDefaultGuardOutputDefinition(0)],
+		template: '{\n  \n}',
+		providerId: 'openrouter',
+		credentialRef: '',
+		model: '',
+		system: '',
+		prompt: '',
+		strictVariables: false,
+		samplers: {},
+		timeoutMs: 60000,
+		retry: {
+			maxAttempts: 1,
+			backoffMs: 0,
+			retryOn: ['timeout', 'provider_error', 'rate_limit'],
+		},
+		artifact,
+	};
+}
+
+export function normalizeGuardKindParams(op: GuardOperationInProfile): FormGuardKindParams {
+	const raw = op.config.params as Record<string, unknown>;
+	const retryRaw = raw.retry && typeof raw.retry === 'object' ? (raw.retry as Record<string, unknown>) : {};
+
+	return {
+		...makeDefaultGuardKindParams(
+			op.opId,
+			normalizeOperationArtifactConfig({
+				opId: op.opId,
+				kind: op.kind,
+				title: op.name,
+				rawParams: raw,
+			}),
+		),
+		engine: raw.engine === 'aux_llm' ? 'aux_llm' : 'liquid',
+		outputContract: normalizeOutputContract(raw.outputContract),
+		template: typeof raw.template === 'string' ? raw.template : '{\n  \n}',
+		providerId: raw.providerId === 'openai_compatible' ? 'openai_compatible' : 'openrouter',
+		credentialRef: typeof raw.credentialRef === 'string' ? raw.credentialRef : '',
+		model: typeof raw.model === 'string' ? raw.model : '',
+		system: typeof raw.system === 'string' ? raw.system : '',
+		prompt: typeof raw.prompt === 'string' ? raw.prompt : '',
+		strictVariables: raw.strictVariables === true,
+		samplers: pickNumericSamplers(raw.samplers),
+		timeoutMs: typeof raw.timeoutMs === 'number' && Number.isFinite(raw.timeoutMs) ? raw.timeoutMs : 60000,
+		retry: {
+			maxAttempts:
+				typeof retryRaw.maxAttempts === 'number' && Number.isFinite(retryRaw.maxAttempts)
+					? Math.max(1, Math.floor(retryRaw.maxAttempts))
+					: 1,
+			backoffMs:
+				typeof retryRaw.backoffMs === 'number' && Number.isFinite(retryRaw.backoffMs)
+					? Math.max(0, Math.floor(retryRaw.backoffMs))
+					: 0,
+			retryOn: normalizeRetryOn(retryRaw.retryOn),
+		},
+	};
+}
+
+export function serializeGuardKindParams(params: FormGuardKindParams, opId: string) {
+	const model = params.model.trim();
+	const system = params.system.trim();
+	const credentialRef = params.credentialRef.trim();
+	const outputContract = normalizeOutputContract(params.outputContract);
+	const samplers = pickNumericSamplers(params.samplers);
+	const timeoutMs = Number.isFinite(params.timeoutMs) ? Math.max(1, Math.floor(params.timeoutMs)) : undefined;
+	const retryMaxAttempts = Number.isFinite(params.retry.maxAttempts) ? Math.max(1, Math.floor(params.retry.maxAttempts)) : 1;
+	const retryBackoffMs = Number.isFinite(params.retry.backoffMs) ? Math.max(0, Math.floor(params.retry.backoffMs)) : 0;
+	const artifact = {
+		...params.artifact,
+		artifactId: params.artifact.artifactId || `artifact:${opId}`,
+		format: 'json' as const,
+	};
+
+	if (params.engine === 'aux_llm') {
+		return {
+			engine: 'aux_llm' as const,
+			outputContract,
+			providerId: params.providerId,
+			credentialRef,
+			model: model.length > 0 ? model : undefined,
+			system: system.length > 0 ? system : undefined,
+			prompt: params.prompt,
+			strictVariables: params.strictVariables ? true : undefined,
+			samplers: Object.keys(samplers).length > 0 ? samplers : undefined,
+			timeoutMs,
+			retry: {
+				maxAttempts: retryMaxAttempts,
+				backoffMs: retryBackoffMs,
+				retryOn: normalizeRetryOn(params.retry.retryOn),
+			},
+			artifact,
+		};
+	}
+
+	return {
+		engine: 'liquid' as const,
+		outputContract,
+		template: params.template,
+		strictVariables: params.strictVariables ? true : undefined,
+		artifact,
+	};
+}
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.ts b/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.ts
new file mode 100644
index 00000000..f2fec429
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.ts
@@ -0,0 +1,36 @@
+import type { LlmOperationRetryOn, LlmOperationSamplers } from '@shared/types/operation-profiles';
+
+export function pickNumericSamplers(raw: unknown): LlmOperationSamplers {
+	if (!raw || typeof raw !== 'object') return {};
+	const r = raw as Record<string, unknown>;
+	const out: LlmOperationSamplers = {};
+	if (typeof r.temperature === 'number' && Number.isFinite(r.temperature)) out.temperature = r.temperature;
+	if (typeof r.topP === 'number' && Number.isFinite(r.topP)) out.topP = r.topP;
+	if (typeof r.topK === 'number' && Number.isFinite(r.topK)) out.topK = r.topK;
+	if (typeof r.minP === 'number' && Number.isFinite(r.minP)) out.minP = r.minP;
+	if (typeof r.topA === 'number' && Number.isFinite(r.topA)) out.topA = r.topA;
+	if (typeof r.frequencyPenalty === 'number' && Number.isFinite(r.frequencyPenalty)) out.frequencyPenalty = r.frequencyPenalty;
+	if (typeof r.presencePenalty === 'number' && Number.isFinite(r.presencePenalty)) out.presencePenalty = r.presencePenalty;
+	if (typeof r.repetitionPenalty === 'number' && Number.isFinite(r.repetitionPenalty)) out.repetitionPenalty = r.repetitionPenalty;
+	if (typeof r.seed === 'number' && Number.isFinite(r.seed)) out.seed = r.seed;
+	if (typeof r.maxTokens === 'number' && Number.isFinite(r.maxTokens)) out.maxTokens = r.maxTokens;
+	if (r.reasoning && typeof r.reasoning === 'object' && !Array.isArray(r.reasoning)) {
+		const rr = r.reasoning as Record<string, unknown>;
+		const reasoning: NonNullable<LlmOperationSamplers['reasoning']> = {};
+		if (typeof rr.enabled === 'boolean') reasoning.enabled = rr.enabled;
+		if (rr.effort === 'low' || rr.effort === 'medium' || rr.effort === 'high') reasoning.effort = rr.effort;
+		if (typeof rr.maxTokens === 'number' && Number.isFinite(rr.maxTokens)) reasoning.maxTokens = rr.maxTokens;
+		if (typeof rr.exclude === 'boolean') reasoning.exclude = rr.exclude;
+		if (Object.keys(reasoning).length > 0) out.reasoning = reasoning;
+	}
+	return out;
+}
+
+export function normalizeRetryOn(value: unknown): LlmOperationRetryOn[] {
+	if (!Array.isArray(value)) return ['timeout', 'provider_error', 'rate_limit'];
+	const filtered = value.filter(
+		(item): item is LlmOperationRetryOn => item === 'timeout' || item === 'provider_error' || item === 'rate_limit',
+	);
+	const unique = Array.from(new Set(filtered));
+	return unique.length > 0 ? unique : ['timeout', 'provider_error', 'rate_limit'];
+}
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
new file mode 100644
index 00000000..f55282ee
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
@@ -0,0 +1,238 @@
+import { describe, expect, it } from 'vitest';
+
+import { makeDefaultGuardKindParams } from './guard-kind-form';
+import { fromOperationProfileForm, toOperationProfileForm, type OperationProfileFormValues } from './operation-profile-form-mapping';
+
+import type { OperationProfileDto } from '../../../../api/chat-core';
+import type { OperationArtifactConfig } from '@shared/types/operation-profiles';
+
+function makeArtifact(overrides?: Partial<OperationArtifactConfig>) {
+	return {
+		artifactId: 'artifact:test',
+		tag: 'test_artifact',
+		title: 'Test Artifact',
+		format: 'json' as const,
+		persistence: 'run_only' as const,
+		writeMode: 'replace' as const,
+		history: {
+			enabled: true,
+			maxItems: 5,
+		},
+		exposures: [],
+		...overrides,
+	};
+}
+
+describe('operation profile form mapping', () => {
+	it('creates guard defaults with a valid output contract', () => {
+		const params = makeDefaultGuardKindParams('guard-1');
+
+		expect(params.outputContract).toEqual([
+			{
+				key: 'branch_1',
+				title: 'Branch 1',
+			},
+		]);
+	});
+
+	it('normalizes guard operations and runConditions into form values', () => {
+		const profile: OperationProfileDto = {
+			profileId: 'profile-1',
+			ownerId: 'owner-1',
+			name: 'Profile',
+			description: 'Profile description',
+			enabled: true,
+			executionMode: 'sequential',
+			operationProfileSessionId: 'session-1',
+			blockRefs: [],
+			operations: [
+				{
+					opId: 'guard-1',
+					name: 'Battle Guard',
+					kind: 'guard',
+					config: {
+						enabled: true,
+						required: false,
+						hooks: ['before_main_llm'],
+						triggers: ['generate'],
+						order: 10,
+						params: {
+							engine: 'liquid',
+							outputContract: [{ key: 'isBattle', title: 'Battle' }],
+							template: '{"isBattle": true}',
+							strictVariables: true,
+							artifact: makeArtifact({ artifactId: 'artifact:guard-1', tag: 'battle_guard' }),
+						},
+					},
+				},
+				{
+					opId: 'template-1',
+					name: 'Consumer',
+					kind: 'template',
+					config: {
+						enabled: true,
+						required: false,
+						hooks: ['before_main_llm'],
+						triggers: ['generate'],
+						order: 20,
+						dependsOn: ['guard-1'],
+						runConditions: [
+							{
+								type: 'guard_output',
+								sourceOpId: 'guard-1',
+								outputKey: 'isBattle',
+								operator: 'is_true',
+							},
+						],
+						params: {
+							template: 'battle',
+							artifact: makeArtifact({ artifactId: 'artifact:template-1', tag: 'battle_result', format: 'markdown' }),
+						},
+					},
+				},
+			],
+			meta: {},
+			version: 1,
+			createdAt: '2026-03-15T00:00:00.000Z',
+			updatedAt: '2026-03-15T00:00:00.000Z',
+		};
+
+		const form = toOperationProfileForm(profile);
+		const guard = form.operations[0];
+		const consumer = form.operations[1];
+
+		expect(guard.kind).toBe('guard');
+		expect(guard.config.params).toMatchObject({
+			engine: 'liquid',
+			outputContract: [{ key: 'isBattle', title: 'Battle' }],
+			template: '{"isBattle": true}',
+			strictVariables: true,
+			artifact: expect.objectContaining({
+				artifactId: 'artifact:guard-1',
+				tag: 'battle_guard',
+				format: 'json',
+			}),
+		});
+		expect(consumer.config.runConditions).toEqual([
+			{
+				type: 'guard_output',
+				sourceOpId: 'guard-1',
+				outputKey: 'isBattle',
+				operator: 'is_true',
+			},
+		]);
+	});
+
+	it('serializes guard operations with aux llm params back to dto shape', () => {
+		const values: OperationProfileFormValues = {
+			name: 'Profile',
+			description: '',
+			enabled: true,
+			executionMode: 'concurrent',
+			operationProfileSessionId: 'session-1',
+			operations: [
+				{
+					opId: 'guard-1',
+					name: 'Night Guard',
+					description: '',
+					kind: 'guard',
+					config: {
+						enabled: true,
+						required: false,
+						hooks: ['before_main_llm'],
+						triggers: ['generate', 'regenerate'],
+						activation: { everyNTurns: 0, everyNContextTokens: 0 },
+						order: 5,
+						dependsOn: [],
+						runConditions: [],
+						params: {
+							engine: 'aux_llm',
+							outputContract: [{ key: 'isNight', title: 'Night' }],
+							template: '',
+							prompt: 'Classify scene',
+							system: 'System',
+							strictVariables: true,
+							providerId: 'openrouter',
+							credentialRef: 'cred-1',
+							model: 'gpt-test',
+							samplers: { temperature: 0.2 },
+							timeoutMs: 15000,
+							retry: {
+								maxAttempts: 2,
+								backoffMs: 250,
+								retryOn: ['timeout'],
+							},
+							artifact: makeArtifact({ artifactId: 'artifact:guard-1', tag: 'night_guard', format: 'json' }),
+						},
+					},
+				},
+				{
+					opId: 'template-1',
+					name: 'Consumer',
+					description: '',
+					kind: 'template',
+					config: {
+						enabled: true,
+						required: false,
+						hooks: ['before_main_llm'],
+						triggers: ['generate'],
+						activation: { everyNTurns: 0, everyNContextTokens: 0 },
+						order: 10,
+						dependsOn: ['guard-1'],
+						runConditions: [
+							{
+								type: 'guard_output',
+								sourceOpId: 'guard-1',
+								outputKey: 'isNight',
+								operator: 'is_false',
+							},
+						],
+						params: {
+							template: 'daytime',
+							strictVariables: false,
+							artifact: makeArtifact({ artifactId: 'artifact:template-1', tag: 'consumer_artifact', format: 'markdown' }),
+						},
+					},
+				},
+			],
+		};
+
+		const result = fromOperationProfileForm(values, { validateJson: true });
+		const guard = result.operations[0];
+		const consumer = result.operations[1];
+
+		expect(guard).toMatchObject({
+			kind: 'guard',
+			config: {
+				params: {
+					engine: 'aux_llm',
+					outputContract: [{ key: 'isNight', title: 'Night' }],
+					prompt: 'Classify scene',
+					system: 'System',
+					strictVariables: true,
+					providerId: 'openrouter',
+					credentialRef: 'cred-1',
+					model: 'gpt-test',
+					samplers: { temperature: 0.2 },
+					timeoutMs: 15000,
+					retry: {
+						maxAttempts: 2,
+						backoffMs: 250,
+						retryOn: ['timeout'],
+					},
+					artifact: expect.objectContaining({
+						format: 'json',
+					}),
+				},
+			},
+		});
+		expect(consumer.config.runConditions).toEqual([
+			{
+				type: 'guard_output',
+				sourceOpId: 'guard-1',
+				outputKey: 'isNight',
+				operator: 'is_false',
+			},
+		]);
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
index b25fd192..7615cec7 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
@@ -8,10 +8,18 @@ import {
 	type OperationArtifactConfig,
 	type OperationInProfile,
 	type OperationKind,
+	type OperationRunCondition,
 	type OperationTemplateParams,
 } from '@shared/types/operation-profiles';
 import { v4 as uuidv4 } from 'uuid';
 
+import {
+	normalizeGuardKindParams,
+	serializeGuardKindParams,
+	type FormGuardKindParams,
+} from './guard-kind-form';
+import { normalizeRetryOn, pickNumericSamplers } from './operation-llm-form-utils';
+
 import type { OperationProfileDto } from '../../../../api/chat-core';
 
 export type FormTemplateParams = Omit<OperationTemplateParams, 'strictVariables'> & {
@@ -23,6 +31,8 @@ export type FormOtherKindParams = {
 	artifact: OperationArtifactConfig;
 };
 
+export type FormRunCondition = OperationRunCondition;
+
 export type FormLlmKindParams = {
 	providerId: LlmOperationParams['providerId'];
 	credentialRef: string;
@@ -63,7 +73,8 @@ export type FormOperation = {
 		};
 		order: number;
 		dependsOn: string[];
-		params: FormTemplateParams | FormLlmKindParams | FormOtherKindParams;
+		runConditions: FormRunCondition[];
+		params: FormTemplateParams | FormLlmKindParams | FormGuardKindParams | FormOtherKindParams;
 	};
 };
 
@@ -115,7 +126,7 @@ export function makeDefaultLlmKindParams(
 
 export function makeDefaultOtherKindParams(
 	opId: string,
-	kind: Exclude<OperationKind, 'template' | 'llm'>,
+	kind: Exclude<OperationKind, 'template' | 'llm' | 'guard'>,
 	artifact: OperationArtifactConfig = makeDefaultArtifactOutput(opId, kind),
 ): FormOtherKindParams {
 	return {
@@ -137,6 +148,20 @@ function toNonNegativeInteger(value: unknown): number {
 	return 0;
 }
 
+function normalizeRunConditions(value: unknown): FormRunCondition[] {
+	if (!Array.isArray(value)) return [];
+	return value.filter(
+		(item): item is FormRunCondition =>
+			Boolean(item) &&
+			typeof item === 'object' &&
+			(item as Record<string, unknown>).type === 'guard_output' &&
+			typeof (item as Record<string, unknown>).sourceOpId === 'string' &&
+			typeof (item as Record<string, unknown>).outputKey === 'string' &&
+			((item as Record<string, unknown>).operator === 'is_true' ||
+				(item as Record<string, unknown>).operator === 'is_false'),
+	);
+}
+
 function normalizeActivation(value: unknown): { everyNTurns: number; everyNContextTokens: number } {
 	if (!value || typeof value !== 'object') {
 		return { everyNTurns: 0, everyNContextTokens: 0 };
@@ -152,41 +177,6 @@ function normalizeActivation(value: unknown): { everyNTurns: number; everyNConte
 	};
 }
 
-function pickNumericSamplers(raw: unknown): LlmOperationSamplers {
-	if (!raw || typeof raw !== 'object') return {};
-	const r = raw as Record<string, unknown>;
-	const out: LlmOperationSamplers = {};
-	if (typeof r.temperature === 'number' && Number.isFinite(r.temperature)) out.temperature = r.temperature;
-	if (typeof r.topP === 'number' && Number.isFinite(r.topP)) out.topP = r.topP;
-	if (typeof r.topK === 'number' && Number.isFinite(r.topK)) out.topK = r.topK;
-	if (typeof r.minP === 'number' && Number.isFinite(r.minP)) out.minP = r.minP;
-	if (typeof r.topA === 'number' && Number.isFinite(r.topA)) out.topA = r.topA;
-	if (typeof r.frequencyPenalty === 'number' && Number.isFinite(r.frequencyPenalty)) out.frequencyPenalty = r.frequencyPenalty;
-	if (typeof r.presencePenalty === 'number' && Number.isFinite(r.presencePenalty)) out.presencePenalty = r.presencePenalty;
-	if (typeof r.repetitionPenalty === 'number' && Number.isFinite(r.repetitionPenalty)) out.repetitionPenalty = r.repetitionPenalty;
-	if (typeof r.seed === 'number' && Number.isFinite(r.seed)) out.seed = r.seed;
-	if (typeof r.maxTokens === 'number' && Number.isFinite(r.maxTokens)) out.maxTokens = r.maxTokens;
-	if (r.reasoning && typeof r.reasoning === 'object' && !Array.isArray(r.reasoning)) {
-		const rr = r.reasoning as Record<string, unknown>;
-		const reasoning: NonNullable<LlmOperationSamplers['reasoning']> = {};
-		if (typeof rr.enabled === 'boolean') reasoning.enabled = rr.enabled;
-		if (rr.effort === 'low' || rr.effort === 'medium' || rr.effort === 'high') reasoning.effort = rr.effort;
-		if (typeof rr.maxTokens === 'number' && Number.isFinite(rr.maxTokens)) reasoning.maxTokens = rr.maxTokens;
-		if (typeof rr.exclude === 'boolean') reasoning.exclude = rr.exclude;
-		if (Object.keys(reasoning).length > 0) out.reasoning = reasoning;
-	}
-	return out;
-}
-
-function normalizeRetryOn(value: unknown): LlmOperationRetryOn[] {
-	if (!Array.isArray(value)) return ['timeout', 'provider_error', 'rate_limit'];
-	const filtered = value.filter(
-		(item): item is LlmOperationRetryOn => item === 'timeout' || item === 'provider_error' || item === 'rate_limit',
-	);
-	const unique = Array.from(new Set(filtered));
-	return unique.length > 0 ? unique : ['timeout', 'provider_error', 'rate_limit'];
-}
-
 function normalizeTemplateParams(op: OperationInProfile): FormTemplateParams {
 	const params = op.config.params as Record<string, unknown>;
 	return {
@@ -289,12 +279,15 @@ export function toOperationProfileForm(profile: OperationProfileDto): OperationP
 				triggers: (op.config.triggers?.length ? op.config.triggers : ['generate', 'regenerate']) as any,
 				activation: normalizeActivation((op.config as any).activation),
 				dependsOn: op.config.dependsOn ?? [],
+				runConditions: normalizeRunConditions((op.config as Record<string, unknown>).runConditions),
 				enabled: Boolean(op.config.enabled),
 				required: Boolean(op.config.required),
 				order: Number((op.config as any).order ?? 0),
 				params:
 					op.kind === 'template'
 						? normalizeTemplateParams(op)
+						: op.kind === 'guard'
+							? normalizeGuardKindParams(op)
 						: op.kind === 'llm'
 							? normalizeLlmKindParams(op)
 							: normalizeOtherKindParams(op),
@@ -330,6 +323,7 @@ export function fromOperationProfileForm(
 							everyNContextTokens: everyNContextTokens > 0 ? everyNContextTokens : undefined,
 						}
 					: undefined;
+			const runConditions = op.config.runConditions?.length ? normalizeRunConditions(op.config.runConditions) : undefined;
 			if (op.kind === 'template') {
 				const params = op.config.params as FormTemplateParams;
 				return {
@@ -345,6 +339,7 @@ export function fromOperationProfileForm(
 						activation,
 						order: Number(op.config.order),
 						dependsOn: op.config.dependsOn?.length ? op.config.dependsOn : undefined,
+						runConditions,
 						params: {
 							template: params.template,
 							strictVariables: params.strictVariables ? true : undefined,
@@ -357,6 +352,27 @@ export function fromOperationProfileForm(
 				};
 			}
 
+			if (op.kind === 'guard') {
+				const params = op.config.params as FormGuardKindParams;
+				return {
+					opId: op.opId,
+					name: op.name,
+					description: op.description.trim() ? op.description.trim() : undefined,
+					kind: 'guard',
+					config: {
+						enabled: Boolean(op.config.enabled),
+						required: Boolean(op.config.required),
+						hooks: op.config.hooks,
+						triggers: op.config.triggers,
+						activation,
+						order: Number(op.config.order),
+						dependsOn: op.config.dependsOn?.length ? op.config.dependsOn : undefined,
+						runConditions,
+						params: serializeGuardKindParams(params, op.opId),
+					},
+				};
+			}
+
 			if (op.kind === 'llm') {
 				const params = op.config.params as FormLlmKindParams;
 				const model = params.model.trim();
@@ -394,6 +410,7 @@ export function fromOperationProfileForm(
 						activation,
 						order: Number(op.config.order),
 						dependsOn: op.config.dependsOn?.length ? op.config.dependsOn : undefined,
+						runConditions,
 						params: {
 							params: {
 								providerId: params.providerId,
@@ -449,7 +466,7 @@ export function fromOperationProfileForm(
 				opId: op.opId,
 				name: op.name,
 				description: op.description.trim() ? op.description.trim() : undefined,
-				kind: op.kind as Exclude<OperationKind, 'template' | 'llm'>,
+				kind: op.kind as Exclude<OperationKind, 'template' | 'llm' | 'guard'>,
 				config: {
 					enabled: Boolean(op.config.enabled),
 					required: Boolean(op.config.required),
@@ -458,6 +475,7 @@ export function fromOperationProfileForm(
 					activation,
 					order: Number(op.config.order),
 					dependsOn: op.config.dependsOn?.length ? op.config.dependsOn : undefined,
+					runConditions,
 					params: {
 						params: asObj,
 						artifact: {
@@ -478,19 +496,20 @@ export function makeDefaultOperation(): FormOperation {
 		name: 'New operation',
 		description: '',
 		kind: 'template',
-		config: {
-			enabled: true,
-			required: false,
-			hooks: ['before_main_llm'],
-			triggers: ['generate', 'regenerate'],
-			activation: {
-				everyNTurns: 0,
-				everyNContextTokens: 0,
-			},
-			order: 10,
-			dependsOn: [],
-			params: {
-				template: '',
+			config: {
+				enabled: true,
+				required: false,
+				hooks: ['before_main_llm'],
+				triggers: ['generate', 'regenerate'],
+				activation: {
+					everyNTurns: 0,
+					everyNContextTokens: 0,
+				},
+				order: 10,
+				dependsOn: [],
+				runConditions: [],
+				params: {
+					template: '',
 				strictVariables: false,
 				artifact: makeDefaultArtifactOutput(opId, 'template'),
 			},
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
index ea2cdb69..5b8bbc0a 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
@@ -7,9 +7,7 @@ import {
 	Background,
 	ConnectionLineType,
 	Controls,
-	type Edge,
 	type EdgeChange,
-	MarkerType,
 	type Node,
 	type NodeChange,
 	Panel,
@@ -29,12 +27,27 @@ import { v4 as uuidv4 } from 'uuid';
 import { updateOperationBlockFx } from '@model/operation-blocks';
 import { Z_INDEX } from '@ui/z-index';
 
-import { fromOperationProfileForm, makeDefaultOperation, toOperationProfileForm, type OperationProfileFormValues } from '../form/operation-profile-form-mapping';
+import {
+	fromOperationProfileForm,
+	makeDefaultOperation,
+	toOperationProfileForm,
+	type FormRunCondition,
+	type OperationProfileFormValues,
+} from '../form/operation-profile-form-mapping';
 import { OperationEditor } from '../ui/operation-editor/operation-editor';
+import { isOperationKind } from '../utils/operation-kind';
 
 import { OperationFlowNode, type OperationFlowNodeData } from './flow/operation-flow-node';
+import { buildOperationFlowNodeData, buildOperationFlowNodeSignature } from './flow/operation-flow-node-model';
 import { useGroupLabelDrag } from './hooks/use-group-label-drag';
 import { computeSimpleLayout, readNodeEditorMeta, writeNodeEditorMeta } from './meta/node-editor-meta';
+import {
+	applyConnectionToOperations,
+	buildOperationGraphEdges,
+	connectSourceToOperation,
+	removeEdgeFromOperations,
+	removeOperationReferences,
+} from './operation-graph';
 import { GroupEditorModal, type GroupEditorDraft } from './ui/group-editor-modal';
 import { GroupOverlays, type EditorGroup } from './ui/group-overlays';
 import { NodeEditorHeader } from './ui/node-editor-header';
@@ -51,48 +64,39 @@ type Props = {
 };
 
 type OpEdge = { source: string; target: string };
+type PendingConnection = { sourceId: string; sourceHandle: string | null };
 
 const GROUP_BG_ALPHA = 0.08;
 
-function buildEdges(operations: Array<{ opId: string; config?: { dependsOn?: string[] } }>): Edge[] {
-	const edges: Edge[] = [];
-	for (const op of operations) {
-		const target = op.opId;
-		const dependsOn = Array.isArray(op.config?.dependsOn) ? op.config!.dependsOn! : [];
-		for (const source of dependsOn) {
-			if (!source || source === target) continue;
-			edges.push({
-				id: `${source}=>${target}`,
-				source,
-				target,
-				animated: false,
-				markerEnd: { type: MarkerType.ArrowClosed },
-				style: { strokeWidth: 2 },
-			});
-		}
-	}
-	return edges;
+function edgesToDeps(edges: Array<{ source: string; target: string }>): OpEdge[] {
+	return edges.map((e) => ({ source: e.source, target: e.target }));
 }
 
-function edgesToDeps(edges: Edge[]): OpEdge[] {
-	return edges.map((e) => ({ source: e.source, target: e.target }));
+function extractOpIds(values: OperationProfileFormValues): string[] {
+	return values.operations.map((o) => o.opId).filter(Boolean);
 }
 
-function removeOpIdFromAllDependsOn(values: OperationProfileFormValues, removedOpId: string): OperationProfileFormValues {
-	return {
-		...values,
-		operations: values.operations.map((op) => ({
-			...op,
-			config: {
-				...op.config,
-				dependsOn: op.config.dependsOn.filter((id) => id !== removedOpId),
-			},
-		})),
-	};
+function readString(value: unknown): string {
+	return typeof value === 'string' ? value : '';
 }
 
-function extractOpIds(values: OperationProfileFormValues): string[] {
-	return values.operations.map((o) => o.opId).filter(Boolean);
+function readStringArray(value: unknown): string[] {
+	return Array.isArray(value) ? value.filter((item): item is string => typeof item === 'string') : [];
+}
+
+function readRunConditions(value: unknown): FormRunCondition[] {
+	return Array.isArray(value)
+		? value.filter(
+				(item): item is FormRunCondition =>
+					Boolean(item) &&
+					typeof item === 'object' &&
+					(item as Record<string, unknown>).type === 'guard_output' &&
+					typeof (item as Record<string, unknown>).sourceOpId === 'string' &&
+					typeof (item as Record<string, unknown>).outputKey === 'string' &&
+					((item as Record<string, unknown>).operator === 'is_true' ||
+						(item as Record<string, unknown>).operator === 'is_false'),
+		  )
+		: [];
 }
 
 function isTextEditingTarget(target: EventTarget | null): boolean {
@@ -128,10 +132,9 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 
 	const initial = useMemo(() => toFormValuesFromBlock(block), [block]);
 	const methods = useForm<OperationProfileFormValues>({ defaultValues: initial });
-	const { control, formState, setValue, reset: resetForm } = methods;
+	const { control, formState, reset: resetForm } = methods;
 
-	const { append, replace } = useFieldArray({ name: 'operations', control, keyName: '_key' });
-	const operations = useWatch({ control, name: 'operations' }) as OperationProfileFormValues['operations'] | undefined;
+	const { fields, append, replace } = useFieldArray({ name: 'operations', control, keyName: '_key' });
 
 	const [selectedOpId, setSelectedOpId] = useState<string | null>(null);
 	const [selectedNodeIds, setSelectedNodeIds] = useState<string[]>([]);
@@ -144,7 +147,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 	const [viewState, setViewState] = useState<NodeEditorViewState>('graph');
 	const [isInspectorVisible, setIsInspectorVisible] = useState(true);
 
-	const connectingSourceIdRef = useRef<string | null>(null);
+	const connectingSourceRef = useRef<PendingConnection | null>(null);
 	const didConnectRef = useRef(false);
 	const prevNodeIdsKeyRef = useRef<string>('');
 	const flowWrapperRef = useRef<HTMLDivElement | null>(null);
@@ -165,23 +168,16 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		setIsInspectorVisible(true);
 
 		const meta = readNodeEditorMeta(block.meta);
-		const resetEdges = buildEdges(initial.operations as Array<{ opId: string; config?: { dependsOn?: string[] } }>);
-		const fallbackPositions = computeSimpleLayout(extractOpIds(initial), edgesToDeps(resetEdges));
+		const resetEdges = buildOperationGraphEdges(initial.operations);
+		const resetFallbackPositions = computeSimpleLayout(extractOpIds(initial), edgesToDeps(resetEdges));
 		const nextNodes: Array<Node<OperationFlowNodeData>> = initial.operations.map((op) => {
-			const pos = meta?.nodes?.[op.opId] ?? fallbackPositions[op.opId] ?? { x: 0, y: 0 };
+			const pos = meta?.nodes?.[op.opId] ?? resetFallbackPositions[op.opId] ?? { x: 0, y: 0 };
 			return {
 				id: op.opId,
 				type: 'operation',
 				position: pos,
 				zIndex: Z_INDEX.flow.node,
-				data: {
-					opId: op.opId,
-					name: op.name,
-					description: op.description,
-					kind: op.kind,
-					isEnabled: Boolean(op.config.enabled),
-					isRequired: Boolean(op.config.required),
-				},
+				data: buildOperationFlowNodeData(op),
 			};
 		});
 		setNodes(nextNodes);
@@ -200,10 +196,67 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		return true;
 	}, []);
 
-	const safeOperations = useMemo(() => (Array.isArray(operations) ? operations : []), [operations]);
-	const opIndexById = useMemo(() => new Map(safeOperations.map((op, idx) => [op.opId, idx])), [safeOperations]);
-
-	const edges = useMemo(() => buildEdges(safeOperations), [safeOperations]);
+	const graphWatchPaths = useMemo(
+		() =>
+			fields.flatMap((_, index) => [
+				`operations.${index}.name`,
+				`operations.${index}.description`,
+				`operations.${index}.kind`,
+				`operations.${index}.config.enabled`,
+				`operations.${index}.config.required`,
+				`operations.${index}.config.dependsOn`,
+				`operations.${index}.config.runConditions`,
+				`operations.${index}.config.params.outputContract`,
+			]),
+		[fields],
+	);
+	const graphWatchValues = useWatch({ control, name: graphWatchPaths as any }) as unknown[] | undefined;
+	const graphOperations = useMemo(
+		() =>
+			fields.map((field, index) => {
+				const base = index * 8;
+				const kindValue = graphWatchValues?.[base + 2];
+				const kind = isOperationKind(kindValue) ? kindValue : 'template';
+				const outputContract = graphWatchValues?.[base + 7];
+				return {
+					opId: typeof field.opId === 'string' ? field.opId : '',
+					name: readString(graphWatchValues?.[base]),
+					description: readString(graphWatchValues?.[base + 1]),
+					kind,
+					config: {
+						enabled: Boolean(graphWatchValues?.[base + 3]),
+						required: Boolean(graphWatchValues?.[base + 4]),
+						dependsOn: readStringArray(graphWatchValues?.[base + 5]),
+						runConditions: readRunConditions(graphWatchValues?.[base + 6]),
+						params:
+							kind === 'guard'
+								? {
+										outputContract: Array.isArray(outputContract) ? outputContract : [],
+									}
+								: {},
+					},
+				};
+			}),
+		[fields, graphWatchValues],
+	);
+	const nodeDrafts = useMemo(
+		() =>
+			graphOperations.map((operation) => {
+				const data = buildOperationFlowNodeData(operation);
+				return {
+					opId: operation.opId,
+					data,
+					signature: buildOperationFlowNodeSignature(data),
+				};
+			}),
+		[graphOperations],
+	);
+	const opIndexById = useMemo(() => new Map(fields.map((field, idx) => [String(field.opId), idx])), [fields]);
+	const edges = useMemo(() => buildOperationGraphEdges(graphOperations), [graphOperations]);
+	const fallbackPositions = useMemo(
+		() => computeSimpleLayout(nodeDrafts.map((draft) => draft.opId), edgesToDeps(edges)),
+		[nodeDrafts, edges],
+	);
 	useEffect(() => {
 		nodesRef.current = nodes;
 	}, [nodes]);
@@ -212,22 +265,14 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 	useEffect(() => {
 		if (!opened) return;
 		const meta = readNodeEditorMeta(block.meta);
-		const fallbackPositions = computeSimpleLayout(extractOpIds(methods.getValues()), edgesToDeps(edges));
-		const initialNodes: Array<Node<OperationFlowNodeData>> = safeOperations.map((op) => {
-			const pos = meta?.nodes?.[op.opId] ?? fallbackPositions[op.opId] ?? { x: 0, y: 0 };
+		const initialNodes: Array<Node<OperationFlowNodeData>> = nodeDrafts.map((draft) => {
+			const pos = meta?.nodes?.[draft.opId] ?? fallbackPositions[draft.opId] ?? { x: 0, y: 0 };
 			return {
-				id: op.opId,
+				id: draft.opId,
 				type: 'operation',
 				position: pos,
 				zIndex: Z_INDEX.flow.node,
-				data: {
-					opId: op.opId,
-					name: op.name,
-					description: op.description,
-					kind: op.kind,
-					isEnabled: Boolean(op.config.enabled),
-					isRequired: Boolean(op.config.required),
-				},
+				data: draft.data,
 			};
 		});
 		setNodes(initialNodes);
@@ -244,29 +289,19 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		if (!opened) return;
 		setNodes((prev) => {
 			const prevById = new Map(prev.map((n) => [String(n.id), n]));
-			const fallbackPositions = computeSimpleLayout(extractOpIds(methods.getValues()), edgesToDeps(edges));
-
-			const next = safeOperations.map((op) => {
-				const existing = prevById.get(op.opId);
-				const nextData: OperationFlowNodeData = {
-					opId: op.opId,
-					name: op.name,
-					description: op.description,
-					kind: op.kind,
-					isEnabled: Boolean(op.config.enabled),
-					isRequired: Boolean(op.config.required),
-				};
+			const next = nodeDrafts.map((draft) => {
+				const existing = prevById.get(draft.opId);
 
 				// Important: preserve measured/width/height/etc that ReactFlow stores in node state.
 				// Otherwise ReactFlow will keep re-measuring and emitting node changes, which can cause
 				// mount-time update loops ("Maximum update depth exceeded").
 				return {
 					...(existing ?? {}),
-					id: op.opId,
+					id: draft.opId,
 					type: 'operation',
-					position: existing?.position ?? fallbackPositions[op.opId] ?? { x: 0, y: 0 },
+					position: existing?.position ?? fallbackPositions[draft.opId] ?? { x: 0, y: 0 },
 					zIndex: existing?.zIndex ?? Z_INDEX.flow.node,
-					data: nextData,
+					data: draft.data,
 				} satisfies Node<OperationFlowNodeData>;
 			});
 
@@ -280,8 +315,6 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 						same = false;
 						break;
 					}
-					const ad = a.data as any;
-					const bd = b.data as any;
 					if (String(a.id) !== String(b.id)) {
 						same = false;
 						break;
@@ -294,14 +327,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 						same = false;
 						break;
 					}
-					if (
-						(ad?.opId ?? '') !== (bd?.opId ?? '') ||
-						(ad?.name ?? '') !== (bd?.name ?? '') ||
-						(ad?.description ?? '') !== (bd?.description ?? '') ||
-						(ad?.kind ?? '') !== (bd?.kind ?? '') ||
-						Boolean(ad?.isEnabled) !== Boolean(bd?.isEnabled) ||
-						Boolean(ad?.isRequired) !== Boolean(bd?.isRequired)
-					) {
+					if (nodeDrafts[i]?.signature !== buildOperationFlowNodeSignature(a.data as OperationFlowNodeData)) {
 						same = false;
 						break;
 					}
@@ -312,7 +338,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 			return next;
 		});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [opened, safeOperations, edges]);
+	}, [opened, nodeDrafts, fallbackPositions]);
 
 	const selectedIndex = selectedOpId ? (opIndexById.get(selectedOpId) ?? null) : null;
 	const isDirty = formState.isDirty || isLayoutDirty;
@@ -360,7 +386,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		const next = makeDefaultOperation();
 		append(next);
 
-		let position = { x: 0, y: safeOperations.length * 160 };
+		let position = { x: 0, y: graphOperations.length * 160 };
 		if (flow && flowWrapperRef.current) {
 			const r = flowWrapperRef.current.getBoundingClientRect();
 			const center = { x: r.left + r.width / 2, y: r.top + r.height / 2 };
@@ -374,14 +400,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 				type: 'operation',
 				position,
 				zIndex: Z_INDEX.flow.node,
-				data: {
-					opId: next.opId,
-					name: next.name,
-					description: next.description,
-					kind: next.kind,
-					isEnabled: true,
-					isRequired: false,
-				},
+				data: buildOperationFlowNodeData(next),
 			},
 		]);
 		setIsLayoutDirty(true);
@@ -394,10 +413,12 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		const ids = selectedNodeIds.length ? selectedNodeIds : selectedOpId ? [selectedOpId] : [];
 		if (ids.length === 0) return;
 
-		// Remove operations + cleanup dependsOn everywhere.
 		let current = methods.getValues();
 		for (const removedOpId of ids) {
-			current = removeOpIdFromAllDependsOn(current, removedOpId);
+			current = {
+				...current,
+				operations: removeOperationReferences(current.operations, removedOpId),
+			};
 		}
 		const nextOps = current.operations.filter((op) => !ids.includes(op.opId));
 		replace(nextOps);
@@ -548,25 +569,26 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		didConnectRef.current = true;
 		if (!conn.source || !conn.target) return;
 		if (conn.source === conn.target) return;
-		const targetIdx = opIndexById.get(conn.target);
-		if (targetIdx === undefined) return;
-
-		const path = `operations.${targetIdx}.config.dependsOn` as const;
-		const current = (methods.getValues(path) ?? []) as string[];
-		if (current.includes(conn.source)) return;
-		setValue(path, [...current, conn.source], { shouldDirty: true });
+		const nextOperations = applyConnectionToOperations(methods.getValues().operations, conn);
+		replace(nextOperations);
 	};
 
-	const onConnectStart = (_: unknown, params: { nodeId?: string | null; handleType?: 'source' | 'target' | null }) => {
+	const onConnectStart = (
+		_: unknown,
+		params: { nodeId?: string | null; handleType?: 'source' | 'target' | null; handleId?: string | null },
+	) => {
 		didConnectRef.current = false;
-		connectingSourceIdRef.current = params.handleType === 'source' && params.nodeId ? String(params.nodeId) : null;
+		connectingSourceRef.current =
+			params.handleType === 'source' && params.nodeId
+				? { sourceId: String(params.nodeId), sourceHandle: params.handleId ?? null }
+				: null;
 	};
 
 	const onConnectEnd = (event: MouseEvent | TouchEvent) => {
-		const sourceId = connectingSourceIdRef.current;
-		connectingSourceIdRef.current = null;
+		const pendingConnection = connectingSourceRef.current;
+		connectingSourceRef.current = null;
 
-		if (!sourceId) return;
+		if (!pendingConnection?.sourceId) return;
 		if (didConnectRef.current) return;
 		if (!flow) return;
 
@@ -589,27 +611,23 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		if (!pos || typeof pos.x !== 'number' || typeof pos.y !== 'number') return;
 
 		const next = makeDefaultOperation();
-		next.config.dependsOn = [sourceId];
-		append(next);
+		const nextOperation = connectSourceToOperation(next, {
+			source: pendingConnection.sourceId,
+			sourceHandle: pendingConnection.sourceHandle,
+		});
+		append(nextOperation);
 
 		setNodes((prev) => [
 			...prev,
 			{
-				id: next.opId,
+				id: nextOperation.opId,
 				type: 'operation',
 				position: { x: pos.x, y: pos.y },
 				zIndex: Z_INDEX.flow.node,
-				data: {
-					opId: next.opId,
-					name: next.name,
-					description: next.description,
-					kind: next.kind,
-					isEnabled: Boolean(next.config.enabled),
-					isRequired: Boolean(next.config.required),
-				},
+				data: buildOperationFlowNodeData(nextOperation),
 			},
 		]);
-		setSelectedOpId(next.opId);
+		setSelectedOpId(nextOperation.opId);
 		setIsLayoutDirty(true);
 		if (isCompactLayout) setViewState('inspector');
 		else setIsInspectorVisible(true);
@@ -619,20 +637,9 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		const removed = changes.filter((c) => c.type === 'remove').map((c) => c.id);
 		if (removed.length === 0) return;
 
-		for (const id of removed) {
-			const [source, target] = String(id).split('=>');
-			if (!source || !target) continue;
-			const targetIdx = opIndexById.get(target);
-			if (targetIdx === undefined) continue;
-			const path = `operations.${targetIdx}.config.dependsOn` as const;
-			const current = (methods.getValues(path) ?? []) as string[];
-			if (!current.includes(source)) continue;
-			setValue(
-				path,
-				current.filter((v) => v !== source),
-				{ shouldDirty: true },
-			);
-		}
+		let nextOperations = methods.getValues().operations;
+		for (const id of removed) nextOperations = removeEdgeFromOperations(nextOperations, String(id));
+		replace(nextOperations);
 	};
 
 	const onNodesChange = (changes: NodeChange[]) => {
@@ -848,7 +855,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 												index={selectedIndex}
 												status={{
 													index: selectedIndex + 1,
-													kind: safeOperations[selectedIndex]?.kind ?? 'template',
+													kind: graphOperations[selectedIndex]?.kind ?? 'template',
 													isDirty,
 												}}
 												canSave={isDirty}
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.test.ts
new file mode 100644
index 00000000..2af5f552
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from 'vitest';
+
+import { makeDefaultArtifactOutput, type FormOperation } from '../../form/operation-profile-form-mapping';
+
+import {
+	buildOperationFlowNodeData,
+	buildOperationFlowNodeSignature,
+	getOperationFlowNodeMinHeight,
+	hasDefaultSourceHandle,
+} from './operation-flow-node-model';
+
+function makeOperation(kind: FormOperation['kind']): FormOperation {
+	return {
+		opId: `${kind}-1`,
+		name: `${kind} op`,
+		description: '',
+		kind,
+		config: {
+			enabled: true,
+			required: false,
+			hooks: ['before_main_llm'],
+			triggers: ['generate'],
+			activation: { everyNTurns: 0, everyNContextTokens: 0 },
+			order: 10,
+			dependsOn: [],
+			runConditions: [],
+			params:
+				kind === 'guard'
+					? {
+							engine: 'liquid',
+							outputContract: [
+								{ key: 'isBattle', title: 'Battle' },
+								{ key: 'isNight', title: 'Night' },
+							],
+							template: '{"isBattle": true, "isNight": false}',
+							strictVariables: false,
+							providerId: 'openrouter',
+							credentialRef: '',
+							model: '',
+							system: '',
+							prompt: '',
+							samplers: {},
+							timeoutMs: 60000,
+							retry: {
+								maxAttempts: 1,
+								backoffMs: 0,
+								retryOn: ['timeout', 'provider_error', 'rate_limit'],
+							},
+							artifact: makeDefaultArtifactOutput('guard-1', 'guard'),
+					  }
+					: {
+							template: '',
+							strictVariables: false,
+							artifact: makeDefaultArtifactOutput(`${kind}-1`, kind),
+					  },
+		},
+	};
+}
+
+describe('operation flow node model', () => {
+	it('removes the default source handle for guard nodes', () => {
+		expect(hasDefaultSourceHandle(buildOperationFlowNodeData(makeOperation('template')))).toBe(true);
+		expect(hasDefaultSourceHandle(buildOperationFlowNodeData(makeOperation('guard')))).toBe(false);
+	});
+
+	it('increases guard node min height as outputs grow', () => {
+		const templateData = buildOperationFlowNodeData(makeOperation('template'));
+		const guardData = buildOperationFlowNodeData(makeOperation('guard'));
+
+		expect(getOperationFlowNodeMinHeight(guardData)).toBeGreaterThan(getOperationFlowNodeMinHeight(templateData));
+	});
+
+	it('includes guard outputs in the node signature', () => {
+		const guardData = buildOperationFlowNodeData(makeOperation('guard'));
+
+		expect(buildOperationFlowNodeSignature(guardData)).toContain('isBattle:Battle');
+		expect(buildOperationFlowNodeSignature(guardData)).toContain('isNight:Night');
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.ts b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.ts
new file mode 100644
index 00000000..ac98d2e5
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.ts
@@ -0,0 +1,54 @@
+import { readGuardOutputContract } from '../../form/guard-kind-form';
+
+import type { OperationFlowNodeData } from './operation-flow-node';
+import type { FormOperation } from '../../form/operation-profile-form-mapping';
+
+const BASE_NODE_MIN_HEIGHT = 92;
+const GUARD_OUTPUT_ROW_HEIGHT = 30;
+
+export type OperationFlowNodeSource = Pick<FormOperation, 'opId' | 'name' | 'description' | 'kind'> & {
+	config: {
+		enabled: boolean;
+		required: boolean;
+		params: unknown;
+	};
+};
+
+export function buildOperationFlowNodeData(operation: OperationFlowNodeSource): OperationFlowNodeData {
+	return {
+		opId: operation.opId,
+		name: operation.name,
+		description: operation.description,
+		kind: operation.kind,
+		isEnabled: Boolean(operation.config.enabled),
+		isRequired: Boolean(operation.config.required),
+		guardOutputs:
+			operation.kind === 'guard'
+				? readGuardOutputContract(operation.config.params).map((output) => ({
+						key: output.key,
+						title: output.title || output.key,
+					}))
+				: [],
+	};
+}
+
+export function buildOperationFlowNodeSignature(data: OperationFlowNodeData): string {
+	return [
+		data.opId,
+		data.name,
+		data.description ?? '',
+		data.kind,
+		data.isEnabled ? '1' : '0',
+		data.isRequired ? '1' : '0',
+		data.guardOutputs.map((output) => `${output.key}:${output.title}`).join('|'),
+	].join('::');
+}
+
+export function hasDefaultSourceHandle(data: OperationFlowNodeData): boolean {
+	return data.kind !== 'guard';
+}
+
+export function getOperationFlowNodeMinHeight(data: OperationFlowNodeData): number {
+	if (data.kind !== 'guard' || data.guardOutputs.length === 0) return BASE_NODE_MIN_HEIGHT;
+	return BASE_NODE_MIN_HEIGHT + data.guardOutputs.length * GUARD_OUTPUT_ROW_HEIGHT;
+}
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx
index b79efb4a..4e2add74 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx
@@ -1,6 +1,10 @@
 import { Badge, Group, Paper, Stack, Text } from '@mantine/core';
-import { Handle, Position, type NodeProps } from '@xyflow/react';
-import React, { memo } from 'react';
+import { Handle, Position, type NodeProps, useUpdateNodeInternals } from '@xyflow/react';
+import React, { memo, useLayoutEffect } from 'react';
+
+import { buildGuardSourceHandleId, DEFAULT_SOURCE_HANDLE_ID } from '../operation-graph';
+
+import { getOperationFlowNodeMinHeight, hasDefaultSourceHandle } from './operation-flow-node-model';
 
 export type OperationFlowNodeData = {
 	opId: string;
@@ -9,10 +13,12 @@ export type OperationFlowNodeData = {
 	kind: string;
 	isEnabled: boolean;
 	isRequired: boolean;
+	guardOutputs: Array<{ key: string; title: string }>;
 };
 
 const NODE_WIDTH = 260;
 const HANDLE_STYLE: React.CSSProperties = { width: 10, height: 10, border: '2px solid var(--mantine-color-blue-6)' };
+const GUARD_HANDLE_STYLE: React.CSSProperties = { ...HANDLE_STYLE, border: '2px solid var(--mantine-color-teal-6)' };
 
 function getKindColor(kind: string): string {
 	switch (kind) {
@@ -20,6 +26,8 @@ function getKindColor(kind: string): string {
 			return 'blue';
 		case 'llm':
 			return 'teal';
+		case 'guard':
+			return 'lime';
 		case 'rag':
 			return 'grape';
 		case 'tool':
@@ -38,6 +46,12 @@ function getKindColor(kind: string): string {
 export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected }) => {
 	const d = data as OperationFlowNodeData;
 	const kindColor = getKindColor(d.kind);
+	const updateNodeInternals = useUpdateNodeInternals();
+	const guardOutputsSignature = d.guardOutputs.map((output) => `${output.key}:${output.title}`).join('|');
+
+	useLayoutEffect(() => {
+		updateNodeInternals(d.opId);
+	}, [d.opId, d.kind, guardOutputsSignature, updateNodeInternals]);
 
 	return (
 		<Paper
@@ -47,6 +61,7 @@ export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected })
 			p="sm"
 			style={{
 				width: NODE_WIDTH,
+				minHeight: getOperationFlowNodeMinHeight(d),
 				position: 'relative',
 				borderWidth: selected ? 2 : 1,
 				borderColor: selected ? 'var(--mantine-color-blue-6)' : undefined,
@@ -54,10 +69,11 @@ export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected })
 		>
 			{/* dependsOn: incoming edges -> target handle on the left */}
 			<Handle type="target" position={Position.Left} style={HANDLE_STYLE} />
-			{/* outgoing edges -> source handle on the right */}
-			<Handle type="source" position={Position.Right} style={HANDLE_STYLE} />
+			{hasDefaultSourceHandle(d) ? (
+				<Handle id={DEFAULT_SOURCE_HANDLE_ID} type="source" position={Position.Right} style={HANDLE_STYLE} />
+			) : null}
 
-			<Stack gap={6}>
+			<Stack gap={4}>
 				<Group justify="space-between" wrap="nowrap" gap="xs">
 					<Text fw={700} size="sm" lineClamp={1} style={{ minWidth: 0 }}>
 						{d.name}
@@ -84,6 +100,39 @@ export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected })
 					</Text>
 				) : null}
 
+				{d.kind === 'guard' && d.guardOutputs.length > 0 ? (
+					<Stack gap={8} pt={2}>
+						{d.guardOutputs.map((output) => (
+							<div
+								key={output.key}
+								style={{
+									position: 'relative',
+									minHeight: 22,
+									display: 'flex',
+									alignItems: 'center',
+									justifyContent: 'flex-end',
+									paddingRight: 18,
+								}}
+							>
+								<Badge size="xs" color="teal" variant="light">
+									{output.title || output.key}
+								</Badge>
+								<Handle
+									id={buildGuardSourceHandleId(output.key)}
+									type="source"
+									position={Position.Right}
+									style={{
+										...GUARD_HANDLE_STYLE,
+										top: '50%',
+										right: -5,
+										transform: 'translateY(-50%)',
+									}}
+								/>
+							</div>
+						))}
+					</Stack>
+				) : null}
+
 				<Text size="xs" c="dimmed" lineClamp={1}>
 					{d.opId}
 				</Text>
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts
new file mode 100644
index 00000000..3155874f
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts
@@ -0,0 +1,137 @@
+import { describe, expect, it } from 'vitest';
+
+import { makeDefaultArtifactOutput, type FormOperation } from '../form/operation-profile-form-mapping';
+
+import {
+	applyConnectionToOperations,
+	buildOperationGraphEdges,
+	buildGuardSourceHandleId,
+	removeEdgeFromOperations,
+} from './operation-graph';
+
+function makeGuardOperation(): FormOperation {
+	return {
+		opId: 'guard-1',
+		name: 'Guard',
+		description: '',
+		kind: 'guard',
+		config: {
+			enabled: true,
+			required: false,
+			hooks: ['before_main_llm'],
+			triggers: ['generate'],
+			activation: { everyNTurns: 0, everyNContextTokens: 0 },
+			order: 10,
+			dependsOn: [],
+			runConditions: [],
+			params: {
+				engine: 'liquid',
+				outputContract: [
+					{ key: 'isBattle', title: 'Battle' },
+					{ key: 'isNight', title: 'Night' },
+				],
+				template: '{"isBattle": true, "isNight": false}',
+				strictVariables: false,
+				prompt: '',
+				system: '',
+				providerId: 'openrouter',
+				credentialRef: '',
+				model: '',
+				samplers: {},
+				timeoutMs: 60000,
+				retry: {
+					maxAttempts: 1,
+					backoffMs: 0,
+					retryOn: ['timeout', 'provider_error', 'rate_limit'],
+				},
+				artifact: makeDefaultArtifactOutput('guard-1', 'guard'),
+			},
+		},
+	};
+}
+
+function makeTemplateOperation(): FormOperation {
+	return {
+		opId: 'template-1',
+		name: 'Consumer',
+		description: '',
+		kind: 'template',
+		config: {
+			enabled: true,
+			required: false,
+			hooks: ['before_main_llm'],
+			triggers: ['generate'],
+			activation: { everyNTurns: 0, everyNContextTokens: 0 },
+			order: 20,
+			dependsOn: [],
+			runConditions: [],
+			params: {
+				template: '',
+				strictVariables: false,
+				artifact: makeDefaultArtifactOutput('template-1', 'template'),
+			},
+		},
+	};
+}
+
+describe('operation graph helpers', () => {
+	it('builds guard branch edges and omits duplicate dependency edge for the same source', () => {
+		const operations: FormOperation[] = [
+			makeGuardOperation(),
+			{
+				...makeTemplateOperation(),
+				config: {
+					...makeTemplateOperation().config,
+					dependsOn: ['guard-1', 'other-1'],
+					runConditions: [
+						{
+							type: 'guard_output',
+							sourceOpId: 'guard-1',
+							outputKey: 'isBattle',
+							operator: 'is_true',
+						},
+					],
+				},
+			},
+		];
+
+		const edges = buildOperationGraphEdges(operations);
+
+		expect(edges.map((edge) => edge.id)).toContain('guard:guard-1:isBattle:is_true=>template-1');
+		expect(edges.map((edge) => edge.id)).toContain('dep:other-1=>template-1');
+		expect(edges.map((edge) => edge.id)).not.toContain('dep:guard-1=>template-1');
+	});
+
+	it('creates runCondition and dependsOn when connecting from a guard output handle', () => {
+		const operations = [makeGuardOperation(), makeTemplateOperation()];
+
+		const next = applyConnectionToOperations(operations, {
+			source: 'guard-1',
+			sourceHandle: buildGuardSourceHandleId('isBattle'),
+			target: 'template-1',
+		});
+
+		expect(next[1]?.config.dependsOn).toEqual(['guard-1']);
+		expect(next[1]?.config.runConditions).toEqual([
+			{
+				type: 'guard_output',
+				sourceOpId: 'guard-1',
+				outputKey: 'isBattle',
+				operator: 'is_true',
+			},
+		]);
+	});
+
+	it('removes guard condition edge and drops implicit dependency when no other condition remains', () => {
+		const operations = applyConnectionToOperations([makeGuardOperation(), makeTemplateOperation()], {
+			source: 'guard-1',
+			sourceHandle: buildGuardSourceHandleId('isBattle'),
+			target: 'template-1',
+		});
+
+		const next = removeEdgeFromOperations(operations, 'guard:guard-1:isBattle:is_true=>template-1');
+
+		expect(next[1]?.config.runConditions).toEqual([]);
+		expect(next[1]?.config.dependsOn).toEqual([]);
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts
new file mode 100644
index 00000000..0366bccb
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts
@@ -0,0 +1,243 @@
+import { MarkerType, type Connection, type Edge } from '@xyflow/react';
+
+import type { FormOperation } from '../form/operation-profile-form-mapping';
+import type { OperationRunCondition } from '@shared/types/operation-profiles';
+
+export const DEPENDENCY_EDGE_PREFIX = 'dep:';
+export const GUARD_EDGE_PREFIX = 'guard:';
+export const GUARD_SOURCE_HANDLE_PREFIX = 'guard-output:';
+export const DEFAULT_SOURCE_HANDLE_ID = 'depends_on';
+
+type GraphEdgeKind = 'dependency' | 'guard_output';
+
+type OperationGraphEdgeData = {
+	kind: GraphEdgeKind;
+	outputKey?: string;
+	operator?: 'is_true' | 'is_false';
+};
+
+type OperationGraphSource = {
+	opId: string;
+	config: {
+		dependsOn?: string[];
+		runConditions?: FormOperation['config']['runConditions'];
+	};
+};
+
+function normalizeRunConditions(conditions: FormOperation['config']['runConditions'] | undefined): OperationRunCondition[] {
+	return Array.isArray(conditions)
+		? conditions.filter(
+				(condition): condition is OperationRunCondition =>
+					Boolean(condition) &&
+					condition.type === 'guard_output' &&
+					typeof condition.sourceOpId === 'string' &&
+					typeof condition.outputKey === 'string' &&
+					(condition.operator === 'is_true' || condition.operator === 'is_false'),
+		  )
+		: [];
+}
+
+export function buildGuardSourceHandleId(outputKey: string): string {
+	return `${GUARD_SOURCE_HANDLE_PREFIX}${outputKey}`;
+}
+
+export function parseGuardSourceHandleId(handleId?: string | null): string | null {
+	if (!handleId?.startsWith(GUARD_SOURCE_HANDLE_PREFIX)) return null;
+	const outputKey = handleId.slice(GUARD_SOURCE_HANDLE_PREFIX.length).trim();
+	return outputKey.length > 0 ? outputKey : null;
+}
+
+function buildDependencyEdgeId(source: string, target: string): string {
+	return `${DEPENDENCY_EDGE_PREFIX}${source}=>${target}`;
+}
+
+function buildGuardEdgeId(condition: OperationRunCondition, target: string): string {
+	return `${GUARD_EDGE_PREFIX}${condition.sourceOpId}:${condition.outputKey}:${condition.operator}=>${target}`;
+}
+
+function parseEdgeId(edgeId: string):
+	| { kind: 'dependency'; source: string; target: string }
+	| { kind: 'guard_output'; source: string; outputKey: string; operator: 'is_true' | 'is_false'; target: string }
+	| null {
+	if (edgeId.startsWith(DEPENDENCY_EDGE_PREFIX)) {
+		const [source, target] = edgeId.slice(DEPENDENCY_EDGE_PREFIX.length).split('=>');
+		if (!source || !target) return null;
+		return { kind: 'dependency', source, target };
+	}
+
+	if (edgeId.startsWith(GUARD_EDGE_PREFIX)) {
+		const [left, target] = edgeId.slice(GUARD_EDGE_PREFIX.length).split('=>');
+		if (!left || !target) return null;
+		const [source, outputKey, operatorRaw] = left.split(':');
+		if (!source || !outputKey || (operatorRaw !== 'is_true' && operatorRaw !== 'is_false')) return null;
+		return { kind: 'guard_output', source, outputKey, operator: operatorRaw, target };
+	}
+
+	return null;
+}
+
+function withUnique<T>(items: T[]): T[] {
+	return Array.from(new Set(items));
+}
+
+function upsertGuardCondition(conditions: OperationRunCondition[], nextCondition: OperationRunCondition): OperationRunCondition[] {
+	if (
+		conditions.some(
+			(condition) =>
+				condition.type === 'guard_output' &&
+				condition.sourceOpId === nextCondition.sourceOpId &&
+				condition.outputKey === nextCondition.outputKey,
+		)
+	) {
+		return conditions;
+	}
+	return [...conditions, nextCondition];
+}
+
+function applyConnectionToOperation(operation: FormOperation, connection: Pick<Connection, 'source' | 'sourceHandle' | 'target'>): FormOperation {
+	if (!connection.source || connection.source === operation.opId) return operation;
+	const outputKey = parseGuardSourceHandleId(connection.sourceHandle);
+	const dependsOn = withUnique([...(operation.config.dependsOn ?? []), connection.source]);
+
+	if (!outputKey) {
+		return {
+			...operation,
+			config: {
+				...operation.config,
+				dependsOn,
+			},
+		};
+	}
+
+	const nextCondition: OperationRunCondition = {
+		type: 'guard_output',
+		sourceOpId: connection.source,
+		outputKey,
+		operator: 'is_true',
+	};
+
+	return {
+		...operation,
+		config: {
+			...operation.config,
+			dependsOn,
+			runConditions: upsertGuardCondition(normalizeRunConditions(operation.config.runConditions), nextCondition),
+		},
+	};
+}
+
+export function applyConnectionToOperations(
+	operations: FormOperation[],
+	connection: Pick<Connection, 'source' | 'sourceHandle' | 'target'>,
+): FormOperation[] {
+	if (!connection.source || !connection.target || connection.source === connection.target) return operations;
+	return operations.map((operation) =>
+		operation.opId === connection.target ? applyConnectionToOperation(operation, connection) : operation,
+	);
+}
+
+export function connectSourceToOperation(
+	operation: FormOperation,
+	connection: Pick<Connection, 'source' | 'sourceHandle'>,
+): FormOperation {
+	return applyConnectionToOperation(operation, {
+		source: connection.source,
+		sourceHandle: connection.sourceHandle,
+		target: operation.opId,
+	});
+}
+
+export function buildOperationGraphEdges(operations: OperationGraphSource[]): Edge<OperationGraphEdgeData>[] {
+	const edges: Edge<OperationGraphEdgeData>[] = [];
+	for (const operation of operations) {
+		const runConditions = normalizeRunConditions(operation.config.runConditions);
+		const guardSources = new Set(runConditions.map((condition) => condition.sourceOpId));
+		for (const source of operation.config.dependsOn ?? []) {
+			if (!source || source === operation.opId || guardSources.has(source)) continue;
+			edges.push({
+				id: buildDependencyEdgeId(source, operation.opId),
+				source,
+				target: operation.opId,
+				sourceHandle: DEFAULT_SOURCE_HANDLE_ID,
+				animated: false,
+				markerEnd: { type: MarkerType.ArrowClosed },
+				style: { strokeWidth: 2 },
+				data: { kind: 'dependency' },
+			});
+		}
+
+		for (const condition of runConditions) {
+			if (condition.sourceOpId === operation.opId) continue;
+			edges.push({
+				id: buildGuardEdgeId(condition, operation.opId),
+				source: condition.sourceOpId,
+				target: operation.opId,
+				sourceHandle: buildGuardSourceHandleId(condition.outputKey),
+				animated: false,
+				markerEnd: { type: MarkerType.ArrowClosed },
+				style: { strokeWidth: 2, stroke: 'var(--mantine-color-teal-6)' },
+				label: condition.operator === 'is_false' ? `${condition.outputKey} = false` : condition.outputKey,
+				data: {
+					kind: 'guard_output',
+					outputKey: condition.outputKey,
+					operator: condition.operator,
+				},
+			});
+		}
+	}
+	return edges;
+}
+
+export function removeEdgeFromOperations(operations: FormOperation[], edgeId: string): FormOperation[] {
+	const edge = parseEdgeId(edgeId);
+	if (!edge) return operations;
+
+	return operations.map((operation) => {
+		if (operation.opId !== edge.target) return operation;
+
+		if (edge.kind === 'dependency') {
+			return {
+				...operation,
+				config: {
+					...operation.config,
+					dependsOn: operation.config.dependsOn.filter((value) => value !== edge.source),
+				},
+			};
+		}
+
+		const nextConditions = normalizeRunConditions(operation.config.runConditions).filter(
+			(condition) =>
+				!(
+					condition.type === 'guard_output' &&
+					condition.sourceOpId === edge.source &&
+					condition.outputKey === edge.outputKey &&
+					condition.operator === edge.operator
+				),
+		);
+		const hasConditionsFromSameSource = nextConditions.some((condition) => condition.sourceOpId === edge.source);
+
+		return {
+			...operation,
+			config: {
+				...operation.config,
+				runConditions: nextConditions,
+				dependsOn: hasConditionsFromSameSource
+					? operation.config.dependsOn
+					: operation.config.dependsOn.filter((value) => value !== edge.source),
+			},
+		};
+	});
+}
+
+export function removeOperationReferences(operations: FormOperation[], removedOpId: string): FormOperation[] {
+	return operations.map((operation) => ({
+		...operation,
+		config: {
+			...operation.config,
+			dependsOn: operation.config.dependsOn.filter((value) => value !== removedOpId),
+			runConditions: normalizeRunConditions(operation.config.runConditions).filter(
+				(condition) => condition.sourceOpId !== removedOpId,
+			),
+		},
+	}));
+}
diff --git a/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx b/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
index a109fdd7..5132b4a1 100644
--- a/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
+++ b/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
@@ -12,23 +12,12 @@ import { FormInput, FormSwitch } from '@ui/form-components';
 import { fromOperationProfileForm, makeDefaultOperation, toOperationProfileForm, type OperationProfileFormValues } from './form/operation-profile-form-mapping';
 import { OperationEditor } from './ui/operation-editor/operation-editor';
 import { OperationList } from './ui/operation-list';
+import { isOperationKind } from './utils/operation-kind';
 
 import type { OperationListRowMeta } from './ui/types';
 import type { OperationBlockDto, OperationProfileDto } from '../../../api/chat-core';
 import type { OperationKind } from '@shared/types/operation-profiles';
 
-function isOperationKind(value: unknown): value is OperationKind {
-	return (
-		value === 'template' ||
-		value === 'llm' ||
-		value === 'rag' ||
-		value === 'tool' ||
-		value === 'compute' ||
-		value === 'transform' ||
-		value === 'legacy'
-	);
-}
-
 type Props = {
 	block: OperationBlockDto;
 	preferSplitLayout: boolean;
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
index 5e20ea02..050c8342 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
@@ -8,6 +8,7 @@ import { FormInput } from '@ui/form-components';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
 
+import { makeDefaultGuardKindParams, type FormGuardKindParams } from '../../form/guard-kind-form';
 import {
 	makeDefaultArtifactOutput,
 	makeDefaultLlmKindParams,
@@ -16,10 +17,11 @@ import {
 	type FormOtherKindParams,
 	type FormTemplateParams,
 } from '../../form/operation-profile-form-mapping';
+import { OPERATION_KIND_OPTIONS, isOperationKind } from '../../utils/operation-kind';
 
 import { OperationSectionsAccordion } from './operation-sections-accordion';
 
-import type { OperationKind } from '@shared/types/operation-profiles';
+import type { OperationArtifactConfig, OperationKind } from '@shared/types/operation-profiles';
 
 const ACTION_TOOLTIP_SETTINGS = TOOLTIP_PORTAL_SETTINGS;
 
@@ -38,23 +40,14 @@ type Props = {
 	onRemove?: () => void;
 };
 
-const kindOptions = ['template', 'llm', 'rag', 'tool', 'compute', 'transform', 'legacy'] as const;
-
-function isOperationKind(value: unknown): value is OperationKind {
-	return (
-		value === 'template' ||
-		value === 'llm' ||
-		value === 'rag' ||
-		value === 'tool' ||
-		value === 'compute' ||
-		value === 'transform' ||
-		value === 'legacy'
-	);
-}
-
-function makeSafeOutput(output: unknown) {
-	if (output && typeof output === 'object') return output;
-	return makeDefaultArtifactOutput();
+function resolveArtifactForKind(opId: string, kind: OperationKind, currentValue: unknown): OperationArtifactConfig {
+	const fallback = makeDefaultArtifactOutput(opId, kind);
+	if (!currentValue || typeof currentValue !== 'object') return fallback;
+	return {
+		...fallback,
+		...(currentValue as OperationArtifactConfig),
+		format: kind === 'guard' ? 'json' : ((currentValue as OperationArtifactConfig).format ?? fallback.format),
+	};
 }
 
 export const OperationEditor: React.FC<Props> = memo(({ index, title, status, canSave, canDiscard, onSave, onDiscard, onRemove }) => {
@@ -122,13 +115,13 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 				<Select
 					{...kindField}
 					label={t('operationProfiles.fields.kind')}
-					data={kindOptions.map((kind) => ({ value: kind, label: t(`operationProfiles.kind.${kind}`) }))}
+					data={OPERATION_KIND_OPTIONS.map((kind) => ({ value: kind, label: t(`operationProfiles.kind.${kind}`) }))}
 					value={normalizedKind}
 					onChange={(next) => {
 						const nextKind: OperationKind = isOperationKind(next) ? next : 'template';
 						onKindChange(nextKind);
 
-						const safeArtifact = makeSafeOutput(artifact);
+						const safeArtifact = resolveArtifactForKind(safeOpId || 'temp-op', nextKind, artifact);
 
 						if (nextKind === 'template') {
 							const nextParams: FormTemplateParams = {
@@ -143,16 +136,22 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 						if (nextKind === 'llm') {
 							const nextParams: FormLlmKindParams = makeDefaultLlmKindParams(
 								safeOpId || 'temp-op',
-								safeArtifact as FormLlmKindParams['artifact'],
+								safeArtifact,
 							);
 							setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
 							return;
 						}
 
+						if (nextKind === 'guard') {
+							const nextParams: FormGuardKindParams = makeDefaultGuardKindParams(safeOpId || 'temp-op', safeArtifact);
+							setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
+							return;
+						}
+
 						const nextParams: FormOtherKindParams = makeDefaultOtherKindParams(
 							safeOpId || 'temp-op',
-							nextKind as Exclude<OperationKind, 'template' | 'llm'>,
-							safeArtifact as FormOtherKindParams['artifact'],
+							nextKind as Exclude<OperationKind, 'template' | 'llm' | 'guard'>,
+							safeArtifact,
 						);
 						setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
 					}}
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/execution-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/execution-section.tsx
index cd2cf1e4..a545a147 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/execution-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/execution-section.tsx
@@ -1,10 +1,12 @@
-import { Group, Stack, Text } from '@mantine/core';
+import { Button, Group, Paper, Stack, Text } from '@mantine/core';
 import React, { useMemo } from 'react';
 import { useFieldArray, useFormContext, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
 import { FormMultiSelect, FormNumberInput, FormSelect } from '@ui/form-components';
 
+import { readGuardOutputContract } from '../../../form/guard-kind-form';
+
 import type { OperationProfileFormValues } from '../../../form/operation-profile-form-mapping';
 
 const hookOptions = [
@@ -29,9 +31,20 @@ export const ExecutionSection: React.FC<Props> = ({ index }) => {
 		name: 'operations',
 		keyName: '_key',
 	});
+	const runConditionsArray = useFieldArray({
+		control,
+		name: `operations.${index}.config.runConditions`,
+		keyName: '_key',
+	});
 
 	const namePaths = useMemo(() => fields.map((_, idx) => `operations.${idx}.name`), [fields]);
 	const watchedNames = useWatch({ control, name: namePaths as any }) as unknown[] | undefined;
+	const watchedOperations = useWatch({ control, name: 'operations' }) as OperationProfileFormValues['operations'] | undefined;
+	const runConditionSourcePaths = useMemo(
+		() => runConditionsArray.fields.map((_, conditionIndex) => `operations.${index}.config.runConditions.${conditionIndex}.sourceOpId`),
+		[index, runConditionsArray.fields],
+	);
+	const watchedRunConditionSources = useWatch({ control, name: runConditionSourcePaths as any }) as unknown[] | undefined;
 
 	const depOptions = useMemo(() => {
 		return fields
@@ -47,6 +60,19 @@ export const ExecutionSection: React.FC<Props> = ({ index }) => {
 
 	const selfOpId = useWatch({ name: `operations.${index}.opId` }) as unknown;
 	const selfId = typeof selfOpId === 'string' ? selfOpId : '';
+	const guardOptions = useMemo(() => {
+		return (watchedOperations ?? [])
+			.map((operation, operationIndex) => {
+				if (operation.opId === selfId || operation.kind !== 'guard') return null;
+				const nameValue = watchedNames?.[operationIndex];
+				const name = typeof nameValue === 'string' ? nameValue : operation.name;
+				return {
+					value: operation.opId,
+					label: name.trim() ? `${name} — ${operation.opId}` : operation.opId,
+				};
+			})
+			.filter((option): option is { value: string; label: string } => option !== null);
+	}, [selfId, watchedNames, watchedOperations]);
 
 	return (
 		<Stack gap="xs">
@@ -109,6 +135,99 @@ export const ExecutionSection: React.FC<Props> = ({ index }) => {
 			<Text size="xs" c="dimmed">
 				{t('operationProfiles.execution.activationRule')}
 			</Text>
+
+			<Paper withBorder p="sm">
+				<Stack gap="xs">
+					<Group justify="space-between" align="center">
+						<Text fw={600}>{t('operationProfiles.execution.runConditions')}</Text>
+						<Button
+							size="xs"
+							variant="light"
+							onClick={() =>
+								runConditionsArray.append({
+									type: 'guard_output',
+									sourceOpId: '',
+									outputKey: '',
+									operator: 'is_true',
+								})
+							}
+						>
+							{t('common.add')}
+						</Button>
+					</Group>
+
+					<Text size="xs" c="dimmed">
+						{t('operationProfiles.execution.runConditionsInfo')}
+					</Text>
+
+					{runConditionsArray.fields.length === 0 ? (
+						<Text size="sm" c="dimmed">
+							{t('operationProfiles.execution.runConditionsEmpty')}
+						</Text>
+					) : (
+						runConditionsArray.fields.map((field, conditionIndex) => {
+							const selectedSourceId =
+								typeof watchedRunConditionSources?.[conditionIndex] === 'string'
+									? watchedRunConditionSources[conditionIndex]
+									: '';
+							const sourceOperation = (watchedOperations ?? []).find((operation) => operation.opId === selectedSourceId);
+							const outputOptions = readGuardOutputContract(sourceOperation?.config.params).map((output) => ({
+								value: output.key,
+								label: output.title || output.key,
+							}));
+
+							return (
+								<Paper key={field._key} withBorder p="sm">
+									<Stack gap="xs">
+										<Group justify="space-between" align="center">
+											<Text fw={600}>{t('operationProfiles.execution.runConditionLabel', { index: conditionIndex + 1 })}</Text>
+											<Button
+												size="xs"
+												color="red"
+												variant="subtle"
+												onClick={() => runConditionsArray.remove(conditionIndex)}
+											>
+												{t('common.delete')}
+											</Button>
+										</Group>
+
+										<Group grow wrap="wrap">
+											<FormSelect
+												name={`operations.${index}.config.runConditions.${conditionIndex}.sourceOpId`}
+												label={t('operationProfiles.execution.conditionSource')}
+												selectProps={{
+													options: guardOptions,
+													comboboxProps: { withinPortal: false },
+													searchable: true,
+												}}
+											/>
+											<FormSelect
+												name={`operations.${index}.config.runConditions.${conditionIndex}.outputKey`}
+												label={t('operationProfiles.execution.conditionOutput')}
+												selectProps={{
+													options: outputOptions,
+													comboboxProps: { withinPortal: false },
+												}}
+											/>
+											<FormSelect
+												name={`operations.${index}.config.runConditions.${conditionIndex}.operator`}
+												label={t('operationProfiles.execution.conditionOperator')}
+												selectProps={{
+													options: [
+														{ value: 'is_true', label: t('operationProfiles.execution.operatorIsTrue') },
+														{ value: 'is_false', label: t('operationProfiles.execution.operatorIsFalse') },
+													],
+													comboboxProps: { withinPortal: false },
+												}}
+											/>
+										</Group>
+									</Stack>
+								</Paper>
+							);
+						})
+					)}
+				</Stack>
+			</Paper>
 		</Stack>
 	);
 };
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/guard-kind-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/guard-kind-section.tsx
new file mode 100644
index 00000000..b0880d05
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/guard-kind-section.tsx
@@ -0,0 +1,186 @@
+import { Button, Divider, Group, Paper, Stack, Text } from '@mantine/core';
+import React from 'react';
+import { useFieldArray, useFormContext, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+
+import { FormCheckbox, FormInput, FormMultiSelect, FormNumberInput, FormSelect, FormTextarea } from '@ui/form-components';
+
+import { makeDefaultGuardOutputDefinition } from '../../../../form/guard-kind-form';
+
+import type { OperationProfileFormValues } from '../../../../form/operation-profile-form-mapping';
+
+type Props = {
+	index: number;
+};
+
+const RETRY_ON_OPTIONS = [
+	{ value: 'timeout', labelKey: 'operationProfiles.kindSection.llm.retryOn.timeout' },
+	{ value: 'provider_error', labelKey: 'operationProfiles.kindSection.llm.retryOn.providerError' },
+	{ value: 'rate_limit', labelKey: 'operationProfiles.kindSection.llm.retryOn.rateLimit' },
+] as const;
+
+export const GuardKindSection: React.FC<Props> = ({ index }) => {
+	const { t } = useTranslation();
+	const { control } = useFormContext<OperationProfileFormValues>();
+	const outputContractArray = useFieldArray({
+		control,
+		name: `operations.${index}.config.params.outputContract`,
+		keyName: '_key',
+	});
+	const enginePath = `operations.${index}.config.params.engine` as const;
+	const retryPath = `operations.${index}.config.params.retry.retryOn` as const;
+	const engine = useWatch({ control, name: enginePath }) as unknown;
+	const resolvedEngine = engine === 'aux_llm' ? 'aux_llm' : 'liquid';
+
+	return (
+		<Stack gap="md">
+			<Text size="sm" c="dimmed">
+				{t('operationProfiles.kindSection.guard.description')}
+			</Text>
+
+			<FormSelect
+				name={enginePath}
+				label={t('operationProfiles.kindSection.guard.engine')}
+				infoTip={t('operationProfiles.kindSection.guard.engineInfo')}
+				selectProps={{
+					options: [
+						{ value: 'liquid', label: t('operationProfiles.kindSection.guard.engineLiquid') },
+						{ value: 'aux_llm', label: t('operationProfiles.kindSection.guard.engineAuxLlm') },
+					],
+					comboboxProps: { withinPortal: false },
+				}}
+			/>
+
+			<Stack gap="xs">
+				<Group justify="space-between" align="center">
+					<Text fw={600}>{t('operationProfiles.kindSection.guard.outputContract')}</Text>
+						<Button
+							size="xs"
+							variant="light"
+							onClick={() =>
+								outputContractArray.append(makeDefaultGuardOutputDefinition(outputContractArray.fields.length))
+							}
+						>
+							{t('common.add')}
+						</Button>
+				</Group>
+				<Text size="xs" c="dimmed">
+					{t('operationProfiles.kindSection.guard.outputContractInfo')}
+				</Text>
+
+				{outputContractArray.fields.length === 0 ? (
+					<Text size="sm" c="dimmed">
+						{t('operationProfiles.kindSection.guard.outputContractEmpty')}
+					</Text>
+				) : (
+					outputContractArray.fields.map((field, outputIndex) => (
+						<Paper key={field._key} withBorder p="sm">
+							<Stack gap="xs">
+								<Group justify="space-between" align="center">
+									<Text fw={600}>{t('operationProfiles.kindSection.guard.outputLabel', { index: outputIndex + 1 })}</Text>
+									<Button size="xs" color="red" variant="subtle" onClick={() => outputContractArray.remove(outputIndex)}>
+										{t('common.delete')}
+									</Button>
+								</Group>
+								<Group grow wrap="wrap">
+									<FormInput
+										name={`operations.${index}.config.params.outputContract.${outputIndex}.key`}
+										label={t('operationProfiles.kindSection.guard.outputKey')}
+										infoTip={t('operationProfiles.kindSection.guard.outputKeyInfo')}
+									/>
+									<FormInput
+										name={`operations.${index}.config.params.outputContract.${outputIndex}.title`}
+										label={t('operationProfiles.kindSection.guard.outputTitle')}
+									/>
+								</Group>
+								<FormInput
+									name={`operations.${index}.config.params.outputContract.${outputIndex}.description`}
+									label={t('operationProfiles.kindSection.guard.outputDescription')}
+								/>
+							</Stack>
+						</Paper>
+					))
+				)}
+			</Stack>
+
+			<Divider />
+
+			<FormCheckbox
+				name={`operations.${index}.config.params.strictVariables`}
+				label={t('operationProfiles.kindSection.guard.strictVariables')}
+				infoTip={t('operationProfiles.kindSection.guard.strictVariablesInfo')}
+			/>
+
+			{resolvedEngine === 'liquid' ? (
+				<FormTextarea
+					name={`operations.${index}.config.params.template`}
+					label={t('operationProfiles.kindSection.guard.template')}
+					infoTip={t('operationProfiles.kindSection.guard.templateInfo')}
+					liquidDocsContext="operation_template"
+					textareaProps={{ minRows: 10, maxRows: 22, autosize: false }}
+				/>
+			) : (
+				<Stack gap="xs">
+					<FormTextarea
+						name={`operations.${index}.config.params.system`}
+						label={t('operationProfiles.kindSection.guard.system')}
+						infoTip={t('operationProfiles.kindSection.guard.systemInfo')}
+						liquidDocsContext="operation_llm"
+						textareaProps={{ minRows: 4, maxRows: 12, autosize: false }}
+					/>
+					<FormTextarea
+						name={`operations.${index}.config.params.prompt`}
+						label={t('operationProfiles.kindSection.guard.prompt')}
+						infoTip={t('operationProfiles.kindSection.guard.promptInfo')}
+						liquidDocsContext="operation_llm"
+						textareaProps={{ minRows: 8, maxRows: 20, autosize: false }}
+					/>
+					<Group grow wrap="wrap">
+						<FormSelect
+							name={`operations.${index}.config.params.providerId`}
+							label={t('operationProfiles.kindSection.guard.providerId')}
+							selectProps={{
+								options: [
+									{ value: 'openrouter', label: 'openrouter' },
+									{ value: 'openai_compatible', label: 'openai_compatible' },
+								],
+								comboboxProps: { withinPortal: false },
+							}}
+						/>
+						<FormInput
+							name={`operations.${index}.config.params.credentialRef`}
+							label={t('operationProfiles.kindSection.guard.credentialRef')}
+						/>
+					</Group>
+					<FormInput name={`operations.${index}.config.params.model`} label={t('operationProfiles.kindSection.guard.model')} />
+					<FormNumberInput
+						name={`operations.${index}.config.params.timeoutMs`}
+						label={t('operationProfiles.kindSection.guard.timeoutMs')}
+						numberInputProps={{ min: 1, step: 1000 }}
+					/>
+					<Group grow wrap="wrap">
+						<FormNumberInput
+							name={`operations.${index}.config.params.retry.maxAttempts`}
+							label={t('operationProfiles.kindSection.guard.retryMaxAttempts')}
+							numberInputProps={{ min: 1, max: 10, step: 1 }}
+						/>
+						<FormNumberInput
+							name={`operations.${index}.config.params.retry.backoffMs`}
+							label={t('operationProfiles.kindSection.guard.retryBackoffMs')}
+							numberInputProps={{ min: 0, step: 100 }}
+						/>
+					</Group>
+					<FormMultiSelect
+						name={retryPath}
+						label={t('operationProfiles.kindSection.guard.retryOn')}
+						infoTip={t('operationProfiles.kindSection.guard.retryOnInfo')}
+						multiSelectProps={{
+							options: RETRY_ON_OPTIONS.map((option) => ({ value: option.value, label: t(option.labelKey) })),
+							comboboxProps: { withinPortal: false },
+						}}
+					/>
+				</Stack>
+			)}
+		</Stack>
+	);
+};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
index 30135ad4..3ffac9da 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
@@ -1,5 +1,5 @@
 import { Button, Group, Paper, Select, Stack, Text } from '@mantine/core';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Controller, useFieldArray, useFormContext, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
@@ -67,14 +67,22 @@ export const OutputSection: React.FC<Props> = ({ index }) => {
 		| {
 				artifactId?: string;
 				exposures?: ArtifactExposure[];
+				format?: 'text' | 'markdown' | 'json';
 		  }
 		| undefined;
+	const kindValue = useWatch({ control, name: `operations.${index}.kind` }) as unknown;
+	const isGuardKind = kindValue === 'guard';
 
 	const exposuresArray = useFieldArray({
 		control,
 		name: `operations.${index}.config.params.artifact.exposures`,
 	});
 
+	useEffect(() => {
+		if (!isGuardKind || artifact?.format === 'json') return;
+		setValue(`operations.${index}.config.params.artifact.format`, 'json', { shouldDirty: true });
+	}, [artifact?.format, index, isGuardKind, setValue]);
+
 	return (
 		<Stack gap="md">
 			<Stack gap="xs">
@@ -104,7 +112,14 @@ export const OutputSection: React.FC<Props> = ({ index }) => {
 					name={`operations.${index}.config.params.artifact.format`}
 					label={t('operationProfiles.sectionsLabels.format')}
 					infoTip={t('operationProfiles.tooltips.format')}
-					selectProps={{ options: formatOptions.map((value) => ({ value, label: t(`operationProfiles.valueLabel.${value}`) })), comboboxProps: { withinPortal: false } }}
+					selectProps={{
+						options: (isGuardKind ? ['json'] : formatOptions).map((value) => ({
+							value,
+							label: t(`operationProfiles.valueLabel.${value}`),
+						})),
+						comboboxProps: { withinPortal: false },
+						disabled: isGuardKind,
+					}}
 				/>
 			</Group>
 
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx
index 1f2ba7e4..6083aaa4 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { ComputeKindSection } from './kind-params/compute-kind-section';
+import { GuardKindSection } from './kind-params/guard-kind-section';
 import { LegacyKindSection } from './kind-params/legacy-kind-section';
 import { LlmKindSection } from './kind-params/llm-kind-section';
 import { RagKindSection } from './kind-params/rag-kind-section';
@@ -21,6 +22,8 @@ export const ParamsSection: React.FC<Props> = ({ index, kind }) => {
 			return <TemplateKindSection index={index} />;
 		case 'llm':
 			return <LlmKindSection index={index} />;
+		case 'guard':
+			return <GuardKindSection index={index} />;
 		case 'rag':
 			return <RagKindSection index={index} />;
 		case 'tool':
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-list.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-list.tsx
index 788f1c4e..61f01c23 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-list.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-list.tsx
@@ -6,6 +6,8 @@ import { useFormContext, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { LuPlus, LuSearch } from 'react-icons/lu';
 
+import { isOperationKind } from '../utils/operation-kind';
+
 import { OperationRowContainer } from './operation-row-container';
 
 import type { OperationFilterState, OperationListRowMeta } from './types';
@@ -39,18 +41,6 @@ const ROW_WATCH_STRIDE = 5;
 const VIRTUALIZATION_THRESHOLD = 25;
 const ROW_ESTIMATED_HEIGHT = 82;
 
-function isOperationKind(value: unknown): value is OperationKind {
-	return (
-		value === 'template' ||
-		value === 'llm' ||
-		value === 'rag' ||
-		value === 'tool' ||
-		value === 'compute' ||
-		value === 'transform' ||
-		value === 'legacy'
-	);
-}
-
 function matchesEnabledFilter(item: OperationRowFilterSnapshot, filter: OperationFilterState['enabled']): boolean {
 	if (filter === 'all') return true;
 	if (filter === 'enabled') return item.enabled;
@@ -124,7 +114,12 @@ export const OperationList: React.FC<Props> = ({
 
 	const kindOptions = useMemo(() => {
 		const set = new Set(rowFilterSnapshots.map((item) => item.kind));
-		return [{ value: 'all', label: t('operationProfiles.filters.allKinds') }, ...Array.from(set).sort().map((value) => ({ value, label: value }))];
+		return [
+			{ value: 'all', label: t('operationProfiles.filters.allKinds') },
+			...Array.from(set)
+				.sort()
+				.map((value) => ({ value, label: t(`operationProfiles.kind.${value}`) })),
+		];
 	}, [rowFilterSnapshots, t]);
 
 	const filteredRows = useMemo(() => {
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-row-container.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-row-container.tsx
index 769bca03..c67010a9 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-row-container.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-row-container.tsx
@@ -2,6 +2,8 @@ import React, { memo } from 'react';
 import { useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import { isOperationKind } from '../utils/operation-kind';
+
 import { OperationRow } from './operation-row';
 
 import type { OperationKind } from '@shared/types/operation-profiles';
@@ -13,18 +15,6 @@ type Props = {
 	onSelect: (opId: string) => void;
 };
 
-function isOperationKind(value: unknown): value is OperationKind {
-	return (
-		value === 'template' ||
-		value === 'llm' ||
-		value === 'rag' ||
-		value === 'tool' ||
-		value === 'compute' ||
-		value === 'transform' ||
-		value === 'legacy'
-	);
-}
-
 export const OperationRowContainer: React.FC<Props> = memo(({ index, opId, selected, onSelect }) => {
 	const { t } = useTranslation();
 	const [nameValue, kindValue, enabledValue, requiredValue, dependsOnValue] = useWatch({
diff --git a/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts b/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts
new file mode 100644
index 00000000..3e8b67d7
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts
@@ -0,0 +1,25 @@
+import type { OperationKind } from '@shared/types/operation-profiles';
+
+export const OPERATION_KIND_OPTIONS = [
+	'template',
+	'llm',
+	'guard',
+	'rag',
+	'tool',
+	'compute',
+	'transform',
+	'legacy',
+] as const satisfies OperationKind[];
+
+export function isOperationKind(value: unknown): value is OperationKind {
+	return (
+		value === 'template' ||
+		value === 'llm' ||
+		value === 'guard' ||
+		value === 'rag' ||
+		value === 'tool' ||
+		value === 'compute' ||
+		value === 'transform' ||
+		value === 'legacy'
+	);
+}
diff --git a/web/src/i18n/resources/en/operationProfiles.ts b/web/src/i18n/resources/en/operationProfiles.ts
index 5c51da26..65116cea 100644
--- a/web/src/i18n/resources/en/operationProfiles.ts
+++ b/web/src/i18n/resources/en/operationProfiles.ts
@@ -152,6 +152,15 @@ const enOperationProfiles = {
 			execution: {
 				activationRule:
 					'Conditions are combined with OR: reaching either threshold is enough. When one triggers, both counters are reset for this operation.',
+				runConditions: 'Run conditions',
+				runConditionsInfo: 'All guard conditions use AND semantics. Each condition also requires the source guard in dependsOn.',
+				runConditionsEmpty: 'No guard conditions yet. Operation will start as soon as dependsOn is satisfied.',
+				runConditionLabel: 'Condition #{{index}}',
+				conditionSource: 'Guard source',
+				conditionOutput: 'Guard output',
+				conditionOperator: 'Operator',
+				operatorIsTrue: 'is true',
+				operatorIsFalse: 'is false',
 			},
 			outputNotes: {
 				artifactModel:
@@ -189,6 +198,7 @@ const enOperationProfiles = {
 			kind: {
 				template: 'Template',
 				llm: 'LLM',
+				guard: 'Guard',
 				rag: 'RAG',
 				tool: 'Tool',
 				compute: 'Compute',
@@ -270,6 +280,37 @@ const enOperationProfiles = {
 						ruleLiterals: 'Numeric/boolean/null literals infer primitive type automatically.',
 					},
 				},
+				guard: {
+					description: 'Guards classify context and emit a flat boolean JSON object for downstream branching.',
+					engine: 'Engine',
+					engineInfo: 'Liquid is deterministic and cheap; aux LLM is suitable for semantic classification.',
+					engineLiquid: 'Liquid / rules',
+					engineAuxLlm: 'Aux LLM',
+					outputContract: 'Output contract',
+					outputContractInfo: 'Each output becomes a branch key available in runConditions and the node editor.',
+					outputContractEmpty: 'Add at least one boolean output key.',
+					outputLabel: 'Output #{{index}}',
+					outputKey: 'Output key',
+					outputKeyInfo: 'Stable JSON field name, for example `isBattle` or `isNight`.',
+					outputTitle: 'Title',
+					outputDescription: 'Description',
+					strictVariables: 'Strict variables',
+					strictVariablesInfo: 'If enabled, unknown Liquid variables fail guard evaluation.',
+					template: 'Guard template',
+					templateInfo: 'Render strict JSON object with boolean values only.',
+					system: 'System prompt',
+					systemInfo: 'Optional aux LLM system prompt for guard classification.',
+					prompt: 'Prompt',
+					promptInfo: 'Prompt rendered against operation context and expected to produce JSON by contract.',
+					providerId: 'Provider',
+					credentialRef: 'Credential',
+					model: 'Model',
+					timeoutMs: 'Timeout (ms)',
+					retryMaxAttempts: 'Retry max attempts',
+					retryBackoffMs: 'Retry backoff (ms)',
+					retryOn: 'Retry on',
+					retryOnInfo: 'Error classes allowed to trigger a retry for aux LLM guard execution.',
+				},
 				rag: {
 					description: 'Configure retrieval source and ranking parameters for context assembly.',
 				},
@@ -297,7 +338,7 @@ const enOperationProfiles = {
 			},
 			nodeEditor: {
 				title: 'Node Editor',
-				subtitle: 'Nodes represent operations. Edges are dependsOn links. Select a node to edit details.',
+				subtitle: 'Nodes represent operations. Solid edges are dependsOn links; teal edges are guard branches.',
 				hideOperation: 'Hide operation',
 				showOperation: 'Show operation',
 				autoLayout: 'Auto-layout',
diff --git a/web/src/i18n/resources/ru/operationProfiles.ts b/web/src/i18n/resources/ru/operationProfiles.ts
index 553b67df..f9d0ed8f 100644
--- a/web/src/i18n/resources/ru/operationProfiles.ts
+++ b/web/src/i18n/resources/ru/operationProfiles.ts
@@ -153,6 +153,15 @@ const ruOperationProfiles = {
 			execution: {
 				activationRule:
 					'Условия объединяются по OR: достаточно одного порога. При срабатывании одного — оба счетчика этой операции сбрасываются.',
+				runConditions: 'Условия запуска',
+				runConditionsInfo: 'Все guard-условия объединяются по AND. Для каждого условия source guard также должен быть в dependsOn.',
+				runConditionsEmpty: 'Guard-условий пока нет. Операция стартует сразу после выполнения dependsOn.',
+				runConditionLabel: 'Условие #{{index}}',
+				conditionSource: 'Источник guard',
+				conditionOutput: 'Выход guard',
+				conditionOperator: 'Оператор',
+				operatorIsTrue: 'равно true',
+				operatorIsFalse: 'равно false',
 			},
 			outputNotes: {
 				artifactModel:
@@ -190,6 +199,7 @@ const ruOperationProfiles = {
 			kind: {
 				template: 'Шаблон',
 				llm: 'LLM',
+				guard: 'Guard',
 				rag: 'RAG',
 				tool: 'Инструмент',
 				compute: 'Вычисление',
@@ -271,6 +281,37 @@ const ruOperationProfiles = {
 						ruleLiterals: 'Числа/boolean/null без descriptor автоматически трактуются как соответствующие примитивные типы.',
 					},
 				},
+				guard: {
+					description: 'Guard-операции классифицируют контекст и возвращают плоский JSON-объект из boolean-флагов для ветвления downstream-операций.',
+					engine: 'Движок',
+					engineInfo: 'Liquid подходит для детерминированных правил, aux LLM — для семантической классификации.',
+					engineLiquid: 'Liquid / правила',
+					engineAuxLlm: 'Aux LLM',
+					outputContract: 'Контракт выхода',
+					outputContractInfo: 'Каждый output становится ключом ветвления для runConditions и node editor.',
+					outputContractEmpty: 'Добавьте хотя бы один boolean output-ключ.',
+					outputLabel: 'Выход #{{index}}',
+					outputKey: 'Ключ выхода',
+					outputKeyInfo: 'Стабильное имя JSON-поля, например `isBattle` или `isNight`.',
+					outputTitle: 'Заголовок',
+					outputDescription: 'Описание',
+					strictVariables: 'Строгие переменные',
+					strictVariablesInfo: 'Если включено, неизвестные Liquid-переменные приводят guard к ошибке.',
+					template: 'Шаблон guard',
+					templateInfo: 'Нужно вернуть строгий JSON-объект только с boolean-значениями.',
+					system: 'System prompt',
+					systemInfo: 'Опциональный системный промпт aux LLM для классификации guard.',
+					prompt: 'Промпт',
+					promptInfo: 'Промпт рендерится в контексте операции и должен вернуть JSON по контракту.',
+					providerId: 'Провайдер',
+					credentialRef: 'Credential',
+					model: 'Модель',
+					timeoutMs: 'Таймаут (мс)',
+					retryMaxAttempts: 'Макс. попыток',
+					retryBackoffMs: 'Пауза между повторами (мс)',
+					retryOn: 'Повторять при',
+					retryOnInfo: 'Классы ошибок, при которых aux LLM guard может быть перезапущен.',
+				},
 				rag: {
 					description: 'Настройте источник retrieval и параметры ранжирования для сборки контекста.',
 				},
@@ -298,7 +339,7 @@ const ruOperationProfiles = {
 			},
 			nodeEditor: {
 				title: 'Node Editor',
-				subtitle: 'Узлы представляют операции. Ребра — dependsOn связи. Выберите узел для редактирования деталей.',
+				subtitle: 'Узлы представляют операции. Обычные ребра — dependsOn связи, бирюзовые — guard-ветки.',
 				hideOperation: 'Скрыть операцию',
 				showOperation: 'Показать операцию',
 				autoLayout: 'Авто-лейаут',

From ee134a21cebaf47cb8809bcead5c0955fbe71599 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sun, 15 Mar 2026 18:36:21 +0300
Subject: [PATCH 19/54] fix: node editor optimisation

---
 .../node-editor/block-node-editor-modal.tsx   | 319 +++++-------------
 .../flow/operation-flow-node-model.ts         |   4 +-
 .../node-editor/flow/operation-flow-node.tsx  |  35 +-
 .../node-editor/graph-form-state.test.ts      |  79 +++++
 .../node-editor/graph-form-state.ts           |  86 +++++
 .../node-editor/operation-graph.ts            |   1 -
 .../ui/node-editor-form-header.tsx            |  44 +++
 .../ui/node-editor-graph-panel.tsx            | 171 ++++++++++
 .../ui/node-editor-inspector-panel.tsx        |  72 ++++
 .../sections/execution-section.tsx            |  57 ++--
 10 files changed, 587 insertions(+), 281 deletions(-)
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/graph-form-state.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/graph-form-state.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-graph-panel.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-inspector-panel.tsx

diff --git a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
index 5b8bbc0a..c85e8d88 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
@@ -1,27 +1,20 @@
 import '@xyflow/react/dist/style.css';
 import './node-editor-modal.css';
 
-import { Alert, Button, Divider, Group, Modal, ScrollArea, SegmentedControl, Select, Stack, Text } from '@mantine/core';
+import { Alert, Divider, Group, Modal, SegmentedControl, Stack } from '@mantine/core';
 import { useMediaQuery } from '@mantine/hooks';
 import {
-	Background,
-	ConnectionLineType,
-	Controls,
 	type EdgeChange,
 	type Node,
 	type NodeChange,
-	Panel,
-	ReactFlow,
-	ReactFlowProvider,
 	type Connection,
 	type ReactFlowInstance,
 	useNodesState,
 } from '@xyflow/react';
 import { useUnit } from 'effector-react';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useDeferredValue, useEffect, useMemo, useRef, useState } from 'react';
 import { FormProvider, useFieldArray, useForm, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { LuPlus, LuTrash2 } from 'react-icons/lu';
 import { v4 as uuidv4 } from 'uuid';
 
 import { updateOperationBlockFx } from '@model/operation-blocks';
@@ -31,14 +24,11 @@ import {
 	fromOperationProfileForm,
 	makeDefaultOperation,
 	toOperationProfileForm,
-	type FormRunCondition,
 	type OperationProfileFormValues,
 } from '../form/operation-profile-form-mapping';
-import { OperationEditor } from '../ui/operation-editor/operation-editor';
-import { isOperationKind } from '../utils/operation-kind';
 
-import { OperationFlowNode, type OperationFlowNodeData } from './flow/operation-flow-node';
 import { buildOperationFlowNodeData, buildOperationFlowNodeSignature } from './flow/operation-flow-node-model';
+import { buildGraphOperations, buildGraphWatchPaths } from './graph-form-state';
 import { useGroupLabelDrag } from './hooks/use-group-label-drag';
 import { computeSimpleLayout, readNodeEditorMeta, writeNodeEditorMeta } from './meta/node-editor-meta';
 import {
@@ -49,11 +39,14 @@ import {
 	removeOperationReferences,
 } from './operation-graph';
 import { GroupEditorModal, type GroupEditorDraft } from './ui/group-editor-modal';
-import { GroupOverlays, type EditorGroup } from './ui/group-overlays';
-import { NodeEditorHeader } from './ui/node-editor-header';
+import { NodeEditorFormHeader } from './ui/node-editor-form-header';
+import { NodeEditorGraphPanel } from './ui/node-editor-graph-panel';
+import { NodeEditorInspectorPanel } from './ui/node-editor-inspector-panel';
 import { computeBoundsFromNodes } from './utils/bounds';
 import { DEFAULT_GROUP_COLOR_HEX, normalizeCssColorToOpaqueRgbString } from './utils/color';
 
+import type { OperationFlowNodeData } from './flow/operation-flow-node';
+import type { EditorGroup } from './ui/group-overlays';
 import type { OperationBlockDto, OperationProfileDto } from '../../../../api/chat-core';
 import type { NodeEditorViewState } from '../ui/types';
 
@@ -76,29 +69,6 @@ function extractOpIds(values: OperationProfileFormValues): string[] {
 	return values.operations.map((o) => o.opId).filter(Boolean);
 }
 
-function readString(value: unknown): string {
-	return typeof value === 'string' ? value : '';
-}
-
-function readStringArray(value: unknown): string[] {
-	return Array.isArray(value) ? value.filter((item): item is string => typeof item === 'string') : [];
-}
-
-function readRunConditions(value: unknown): FormRunCondition[] {
-	return Array.isArray(value)
-		? value.filter(
-				(item): item is FormRunCondition =>
-					Boolean(item) &&
-					typeof item === 'object' &&
-					(item as Record<string, unknown>).type === 'guard_output' &&
-					typeof (item as Record<string, unknown>).sourceOpId === 'string' &&
-					typeof (item as Record<string, unknown>).outputKey === 'string' &&
-					((item as Record<string, unknown>).operator === 'is_true' ||
-						(item as Record<string, unknown>).operator === 'is_false'),
-		  )
-		: [];
-}
-
 function isTextEditingTarget(target: EventTarget | null): boolean {
 	if (!target || !(target instanceof HTMLElement)) return false;
 	if (target.isContentEditable) return true;
@@ -132,7 +102,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 
 	const initial = useMemo(() => toFormValuesFromBlock(block), [block]);
 	const methods = useForm<OperationProfileFormValues>({ defaultValues: initial });
-	const { control, formState, reset: resetForm } = methods;
+	const { control, reset: resetForm } = methods;
 
 	const { fields, append, replace } = useFieldArray({ name: 'operations', control, keyName: '_key' });
 
@@ -187,8 +157,6 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		resetToInitialState();
 	}, [resetToInitialState]);
 
-	const nodeTypes = useMemo(() => ({ operation: OperationFlowNode }), []);
-
 	const areStringArraysEqual = useCallback((a: string[], b: string[]) => {
 		if (a === b) return true;
 		if (a.length !== b.length) return false;
@@ -196,52 +164,13 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		return true;
 	}, []);
 
-	const graphWatchPaths = useMemo(
-		() =>
-			fields.flatMap((_, index) => [
-				`operations.${index}.name`,
-				`operations.${index}.description`,
-				`operations.${index}.kind`,
-				`operations.${index}.config.enabled`,
-				`operations.${index}.config.required`,
-				`operations.${index}.config.dependsOn`,
-				`operations.${index}.config.runConditions`,
-				`operations.${index}.config.params.outputContract`,
-			]),
-		[fields],
-	);
+	const graphWatchPaths = useMemo(() => buildGraphWatchPaths(fields.length), [fields.length]);
 	const graphWatchValues = useWatch({ control, name: graphWatchPaths as any }) as unknown[] | undefined;
-	const graphOperations = useMemo(
-		() =>
-			fields.map((field, index) => {
-				const base = index * 8;
-				const kindValue = graphWatchValues?.[base + 2];
-				const kind = isOperationKind(kindValue) ? kindValue : 'template';
-				const outputContract = graphWatchValues?.[base + 7];
-				return {
-					opId: typeof field.opId === 'string' ? field.opId : '',
-					name: readString(graphWatchValues?.[base]),
-					description: readString(graphWatchValues?.[base + 1]),
-					kind,
-					config: {
-						enabled: Boolean(graphWatchValues?.[base + 3]),
-						required: Boolean(graphWatchValues?.[base + 4]),
-						dependsOn: readStringArray(graphWatchValues?.[base + 5]),
-						runConditions: readRunConditions(graphWatchValues?.[base + 6]),
-						params:
-							kind === 'guard'
-								? {
-										outputContract: Array.isArray(outputContract) ? outputContract : [],
-									}
-								: {},
-					},
-				};
-			}),
-		[fields, graphWatchValues],
-	);
+	const graphOperations = useMemo(() => buildGraphOperations(fields, graphWatchValues), [fields, graphWatchValues]);
+	const deferredGraphOperations = useDeferredValue(graphOperations);
 	const nodeDrafts = useMemo(
 		() =>
-			graphOperations.map((operation) => {
+			deferredGraphOperations.map((operation) => {
 				const data = buildOperationFlowNodeData(operation);
 				return {
 					opId: operation.opId,
@@ -249,10 +178,10 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 					signature: buildOperationFlowNodeSignature(data),
 				};
 			}),
-		[graphOperations],
+		[deferredGraphOperations],
 	);
 	const opIndexById = useMemo(() => new Map(fields.map((field, idx) => [String(field.opId), idx])), [fields]);
-	const edges = useMemo(() => buildOperationGraphEdges(graphOperations), [graphOperations]);
+	const edges = useMemo(() => buildOperationGraphEdges(deferredGraphOperations), [deferredGraphOperations]);
 	const fallbackPositions = useMemo(
 		() => computeSimpleLayout(nodeDrafts.map((draft) => draft.opId), edgesToDeps(edges)),
 		[nodeDrafts, edges],
@@ -341,7 +270,6 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 	}, [opened, nodeDrafts, fallbackPositions]);
 
 	const selectedIndex = selectedOpId ? (opIndexById.get(selectedOpId) ?? null) : null;
-	const isDirty = formState.isDirty || isLayoutDirty;
 
 	const onSave = methods.handleSubmit(async (values) => {
 		setJsonError(null);
@@ -382,11 +310,11 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		}
 	});
 
-	const addOperation = () => {
+	const addOperation = useCallback(() => {
 		const next = makeDefaultOperation();
 		append(next);
 
-		let position = { x: 0, y: graphOperations.length * 160 };
+		let position = { x: 0, y: fields.length * 160 };
 		if (flow && flowWrapperRef.current) {
 			const r = flowWrapperRef.current.getBoundingClientRect();
 			const center = { x: r.left + r.width / 2, y: r.top + r.height / 2 };
@@ -407,7 +335,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		setSelectedOpId(next.opId);
 		if (isCompactLayout) setViewState('inspector');
 		else setIsInspectorVisible(true);
-	};
+	}, [append, fields.length, flow, isCompactLayout, setNodes]);
 
 	const deleteSelectedNodes = useCallback(() => {
 		const ids = selectedNodeIds.length ? selectedNodeIds : selectedOpId ? [selectedOpId] : [];
@@ -565,15 +493,15 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		if (!groups[groupEditor.groupId]) setGroupEditor(null);
 	}, [groupEditor, groups]);
 
-	const onConnect = (conn: Connection) => {
+	const onConnect = useCallback((conn: Connection) => {
 		didConnectRef.current = true;
 		if (!conn.source || !conn.target) return;
 		if (conn.source === conn.target) return;
 		const nextOperations = applyConnectionToOperations(methods.getValues().operations, conn);
 		replace(nextOperations);
-	};
+	}, [methods, replace]);
 
-	const onConnectStart = (
+	const onConnectStart = useCallback((
 		_: unknown,
 		params: { nodeId?: string | null; handleType?: 'source' | 'target' | null; handleId?: string | null },
 	) => {
@@ -582,9 +510,9 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 			params.handleType === 'source' && params.nodeId
 				? { sourceId: String(params.nodeId), sourceHandle: params.handleId ?? null }
 				: null;
-	};
+	}, []);
 
-	const onConnectEnd = (event: MouseEvent | TouchEvent) => {
+	const onConnectEnd = useCallback((event: MouseEvent | TouchEvent) => {
 		const pendingConnection = connectingSourceRef.current;
 		connectingSourceRef.current = null;
 
@@ -631,21 +559,21 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		setIsLayoutDirty(true);
 		if (isCompactLayout) setViewState('inspector');
 		else setIsInspectorVisible(true);
-	};
+	}, [append, flow, isCompactLayout, setNodes]);
 
-	const onEdgesChange = (changes: EdgeChange[]) => {
+	const onEdgesChange = useCallback((changes: EdgeChange[]) => {
 		const removed = changes.filter((c) => c.type === 'remove').map((c) => c.id);
 		if (removed.length === 0) return;
 
 		let nextOperations = methods.getValues().operations;
 		for (const id of removed) nextOperations = removeEdgeFromOperations(nextOperations, String(id));
 		replace(nextOperations);
-	};
+	}, [methods, replace]);
 
-	const onNodesChange = (changes: NodeChange[]) => {
+	const onNodesChange = useCallback((changes: NodeChange[]) => {
 		onNodesChangeBase(changes as any);
 		if (changes.some((c) => c.type === 'position')) setIsLayoutDirty(true);
-	};
+	}, [onNodesChangeBase]);
 
 	const onSelectionChange = useCallback(
 		({ nodes: selectedNodes }: { nodes: Array<{ id: string | number }> }) => {
@@ -670,12 +598,12 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		if (isCompactLayout) setViewState('graph');
 	}, [isCompactLayout]);
 
-	const onNodeDragStop = (_: unknown, node: Node) => {
+	const onNodeDragStop = useCallback((_: unknown, node: Node) => {
 		setNodes((prev) => prev.map((n) => (String(n.id) === String(node.id) ? { ...n, position: node.position } : n)));
 		setIsLayoutDirty(true);
-	};
+	}, [setNodes]);
 
-	const autoLayout = () => {
+	const autoLayout = useCallback(() => {
 		const opIds = extractOpIds(methods.getValues());
 		const deps = edgesToDeps(edges);
 		const positions = computeSimpleLayout(opIds, deps);
@@ -686,7 +614,18 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 			}),
 		);
 		setIsLayoutDirty(true);
-	};
+	}, [edges, methods, setNodes]);
+
+	const deleteSelectedAction = useCallback(() => {
+		if (!window.confirm(t('operationProfiles.confirm.deleteSelectedOperations'))) return;
+		deleteSelectedNodes();
+	}, [deleteSelectedNodes, t]);
+
+	const ungroupSelectedAction = useCallback(() => {
+		if (!selectedGroupId) return;
+		if (!window.confirm(t('operationProfiles.confirm.ungroupSelected'))) return;
+		ungroupSelected();
+	}, [selectedGroupId, t, ungroupSelected]);
 
 	const showGraphPanel = !isCompactLayout || viewState === 'graph';
 	const showInspectorPanel = isCompactLayout ? viewState === 'inspector' : isInspectorVisible;
@@ -706,9 +645,9 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		>
 			<FormProvider {...methods}>
 				<Stack gap="sm" style={{ flex: 1, minHeight: 0 }} className="opNodeShell">
-					<NodeEditorHeader
+					<NodeEditorFormHeader
 						profileName={block.name}
-						isDirty={isDirty}
+						isLayoutDirty={isLayoutDirty}
 						onAutoLayout={autoLayout}
 						onSave={onSave}
 						onClose={onClose}
@@ -738,140 +677,52 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 
 					<Group gap={0} wrap="nowrap" align="stretch" style={{ flex: 1, minHeight: 0 }}>
 						{showGraphPanel && (
-							<div ref={flowWrapperRef} className="opProfileNodeEditorFlow opNodePanel" style={{ flex: 1, minHeight: 0 }}>
-								<ReactFlowProvider>
-									<ReactFlow
-										nodes={nodes}
-										edges={edges}
-										nodeTypes={nodeTypes}
-										connectionLineType={ConnectionLineType.SmoothStep}
-										onInit={setFlow}
-										onConnect={onConnect}
-										onConnectStart={onConnectStart}
-										onConnectEnd={onConnectEnd}
-										onEdgesChange={onEdgesChange}
-										onNodesChange={onNodesChange}
-										onNodeDragStop={onNodeDragStop}
-										selectionOnDrag
-										selectionKeyCode={['Shift']}
-										multiSelectionKeyCode={['Control', 'Meta', 'Shift']}
-										deleteKeyCode={null}
-										onSelectionChange={onSelectionChange as any}
-										onNodeClick={onNodeClick}
-										onPaneClick={onPaneClick}
-									>
-										<Background />
-										<Controls />
-										<GroupOverlays
-											groups={groups}
-											selectedGroupId={selectedGroupId}
-											groupBgAlpha={GROUP_BG_ALPHA}
-											computeBounds={computeGroupBounds}
-											onLabelPointerDown={groupLabelDrag.onPointerDown}
-											onLabelPointerMove={groupLabelDrag.onPointerMove}
-											onLabelPointerUp={groupLabelDrag.onPointerUp}
-										/>
-										<Panel position="top-left">
-											<Stack gap={6} className="opNodeToolbar">
-												<Group gap="xs" wrap="nowrap">
-													<Button size="xs" leftSection={<LuPlus />} onClick={addOperation}>
-														{t('common.add')}
-													</Button>
-													<Button
-														size="xs"
-														color="red"
-														variant="light"
-														leftSection={<LuTrash2 />}
-														disabled={selectedNodeIds.length === 0 && !selectedOpId}
-														onClick={() => {
-															if (!window.confirm(t('operationProfiles.confirm.deleteSelectedOperations'))) return;
-															deleteSelectedNodes();
-														}}
-													>
-														{t('common.delete')}
-													</Button>
-													<Button
-														size="xs"
-														variant="light"
-														disabled={selectedNodeIds.length < 2}
-														onClick={createGroupFromSelection}
-													>
-														{t('operationProfiles.actions.group')}
-													</Button>
-												</Group>
-
-												<Group gap="xs" wrap="nowrap">
-													<Select
-														size="xs"
-														placeholder={t('operationProfiles.nodeEditor.groupsPlaceholder')}
-														data={groupSelectData}
-														value={selectedGroupId ?? ''}
-														onChange={(value) => setSelectedGroupId(value && value !== '' ? value : null)}
-														comboboxProps={{ withinPortal: false }}
-														style={{ minWidth: 200 }}
-													/>
-													<Button
-														size="xs"
-														variant="default"
-														disabled={!selectedGroupId}
-														onClick={() => {
-															if (!selectedGroupId) return;
-															if (!window.confirm(t('operationProfiles.confirm.ungroupSelected'))) return;
-															ungroupSelected();
-														}}
-													>
-														{t('operationProfiles.actions.ungroup')}
-													</Button>
-												</Group>
-											</Stack>
-										</Panel>
-									</ReactFlow>
-								</ReactFlowProvider>
-							</div>
+							<NodeEditorGraphPanel
+								flowWrapperRef={flowWrapperRef}
+								nodes={nodes}
+								edges={edges}
+								onInit={setFlow}
+								onConnect={onConnect}
+								onConnectStart={onConnectStart}
+								onConnectEnd={onConnectEnd}
+								onEdgesChange={onEdgesChange}
+								onNodesChange={onNodesChange}
+								onNodeDragStop={onNodeDragStop}
+								onSelectionChange={onSelectionChange}
+								onNodeClick={onNodeClick}
+								onPaneClick={onPaneClick}
+								groups={groups}
+								selectedGroupId={selectedGroupId}
+								groupBgAlpha={GROUP_BG_ALPHA}
+								computeGroupBounds={computeGroupBounds}
+								onGroupLabelPointerDown={groupLabelDrag.onPointerDown}
+								onGroupLabelPointerMove={groupLabelDrag.onPointerMove}
+								onGroupLabelPointerUp={groupLabelDrag.onPointerUp}
+								onAddOperation={addOperation}
+								onDeleteSelected={deleteSelectedAction}
+								onCreateGroup={createGroupFromSelection}
+								selectedNodeCount={selectedNodeIds.length}
+								hasSelectedOperation={Boolean(selectedOpId)}
+								groupOptions={groupSelectData}
+								onSelectedGroupChange={setSelectedGroupId}
+								onUngroup={ungroupSelectedAction}
+							/>
 						)}
 
 						{showInspectorPanel && (
 							<>
 								{!isCompactLayout && <Divider orientation="vertical" mx="md" />}
 
-								<ScrollArea className="opNodePanel" style={{ width: isCompactLayout ? '100%' : 480, height: '100%' }} p="md">
-									<Stack gap="md" className="opNodeInspector">
-										<div className="opNodeInspectorHeader">
-											<Group justify="space-between" wrap="nowrap">
-												<Text fw={800}>{t('operationProfiles.operationEditor.title')}</Text>
-												<Text size="xs" c="dimmed">
-													{selectedIndex === null ? '—' : `#${selectedIndex + 1}`}
-												</Text>
-											</Group>
-										</div>
-
-										{selectedIndex === null ? (
-											<Text size="sm" c="dimmed">
-												{t('operationProfiles.nodeEditor.selectNode')}
-											</Text>
-										) : (
-											<OperationEditor
-												key={selectedOpId ?? String(selectedIndex)}
-												index={selectedIndex}
-												status={{
-													index: selectedIndex + 1,
-													kind: graphOperations[selectedIndex]?.kind ?? 'template',
-													isDirty,
-												}}
-												canSave={isDirty}
-												canDiscard={isDirty}
-												onSave={onSave}
-												onDiscard={() => {
-													resetToInitialState();
-												}}
-												onRemove={() => {
-													if (!window.confirm(t('operationProfiles.confirm.deleteSelectedOperations'))) return;
-													deleteSelectedNodes();
-												}}
-											/>
-										)}
-									</Stack>
-								</ScrollArea>
+								<NodeEditorInspectorPanel
+									selectedIndex={selectedIndex}
+									selectedOpId={selectedOpId}
+									selectedKind={graphOperations[selectedIndex ?? -1]?.kind ?? 'template'}
+									isCompactLayout={isCompactLayout}
+									isLayoutDirty={isLayoutDirty}
+									onSave={onSave}
+									onDiscard={resetToInitialState}
+									onRemove={deleteSelectedAction}
+								/>
 							</>
 						)}
 					</Group>
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.ts b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.ts
index ac98d2e5..ad8c5354 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.ts
+++ b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.ts
@@ -3,8 +3,8 @@ import { readGuardOutputContract } from '../../form/guard-kind-form';
 import type { OperationFlowNodeData } from './operation-flow-node';
 import type { FormOperation } from '../../form/operation-profile-form-mapping';
 
-const BASE_NODE_MIN_HEIGHT = 92;
-const GUARD_OUTPUT_ROW_HEIGHT = 30;
+const BASE_NODE_MIN_HEIGHT = 68;
+const GUARD_OUTPUT_ROW_HEIGHT = 34;
 
 export type OperationFlowNodeSource = Pick<FormOperation, 'opId' | 'name' | 'description' | 'kind'> & {
 	config: {
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx
index 4e2add74..91f76bd6 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx
@@ -50,7 +50,10 @@ export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected })
 	const guardOutputsSignature = d.guardOutputs.map((output) => `${output.key}:${output.title}`).join('|');
 
 	useLayoutEffect(() => {
-		updateNodeInternals(d.opId);
+		const frameId = window.requestAnimationFrame(() => {
+			updateNodeInternals(d.opId);
+		});
+		return () => window.cancelAnimationFrame(frameId);
 	}, [d.opId, d.kind, guardOutputsSignature, updateNodeInternals]);
 
 	return (
@@ -65,6 +68,7 @@ export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected })
 				position: 'relative',
 				borderWidth: selected ? 2 : 1,
 				borderColor: selected ? 'var(--mantine-color-blue-6)' : undefined,
+				opacity: d.isEnabled ? 1 : 0.72,
 			}}
 		>
 			{/* dependsOn: incoming edges -> target handle on the left */}
@@ -73,7 +77,7 @@ export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected })
 				<Handle id={DEFAULT_SOURCE_HANDLE_ID} type="source" position={Position.Right} style={HANDLE_STYLE} />
 			) : null}
 
-			<Stack gap={4}>
+			<Stack gap={8}>
 				<Group justify="space-between" wrap="nowrap" gap="xs">
 					<Text fw={700} size="sm" lineClamp={1} style={{ minWidth: 0 }}>
 						{d.name}
@@ -83,38 +87,27 @@ export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected })
 					</Badge>
 				</Group>
 
-				<Group gap={6} wrap="wrap">
-					<Badge size="sm" color={d.isEnabled ? 'green' : 'gray'} variant="light">
-						{d.isEnabled ? 'enabled' : 'disabled'}
-					</Badge>
-					{d.isRequired && (
-						<Badge size="sm" color="orange" variant="light">
-							required
-						</Badge>
-					)}
-				</Group>
-
 				{d.description?.trim() ? (
-					<Text size="xs" c="dimmed" lineClamp={3}>
+					<Text size="xs" c="dimmed" lineClamp={2}>
 						{d.description}
 					</Text>
 				) : null}
 
 				{d.kind === 'guard' && d.guardOutputs.length > 0 ? (
-					<Stack gap={8} pt={2}>
+					<Stack gap={10}>
 						{d.guardOutputs.map((output) => (
 							<div
 								key={output.key}
 								style={{
 									position: 'relative',
-									minHeight: 22,
+									minHeight: 28,
 									display: 'flex',
 									alignItems: 'center',
 									justifyContent: 'flex-end',
-									paddingRight: 18,
+									paddingRight: 20,
 								}}
 							>
-								<Badge size="xs" color="teal" variant="light">
+								<Badge size="sm" color="teal" variant="light">
 									{output.title || output.key}
 								</Badge>
 								<Handle
@@ -124,7 +117,7 @@ export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected })
 									style={{
 										...GUARD_HANDLE_STYLE,
 										top: '50%',
-										right: -5,
+										right: -6,
 										transform: 'translateY(-50%)',
 									}}
 								/>
@@ -132,10 +125,6 @@ export const OperationFlowNode: React.FC<NodeProps> = memo(({ data, selected })
 						))}
 					</Stack>
 				) : null}
-
-				<Text size="xs" c="dimmed" lineClamp={1}>
-					{d.opId}
-				</Text>
 			</Stack>
 		</Paper>
 	);
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/graph-form-state.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/graph-form-state.test.ts
new file mode 100644
index 00000000..3a6379c3
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/graph-form-state.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildGraphOperations, buildGraphWatchPaths } from './graph-form-state';
+
+describe('graph-form-state', () => {
+	it('builds narrow watch paths for graph projection', () => {
+		expect(buildGraphWatchPaths(2)).toEqual([
+			'operations.0.name',
+			'operations.0.description',
+			'operations.0.kind',
+			'operations.0.config.enabled',
+			'operations.0.config.required',
+			'operations.0.config.dependsOn',
+			'operations.0.config.runConditions',
+			'operations.0.config.params.outputContract',
+			'operations.1.name',
+			'operations.1.description',
+			'operations.1.kind',
+			'operations.1.config.enabled',
+			'operations.1.config.required',
+			'operations.1.config.dependsOn',
+			'operations.1.config.runConditions',
+			'operations.1.config.params.outputContract',
+		]);
+	});
+
+	it('normalizes graph operations and keeps guard output contract only for guards', () => {
+		const operations = buildGraphOperations(
+			[{ opId: 'guard-1' }, { opId: 'llm-1' }],
+			[
+				'Guard',
+				'Checks context',
+				'guard',
+				true,
+				false,
+				['root'],
+				[{ type: 'guard_output', sourceOpId: 'root', outputKey: 'battle', operator: 'is_true' }],
+				[{ key: 'battle', title: 'Battle' }],
+				'LLM',
+				'Writes text',
+				'llm',
+				false,
+				true,
+				['guard-1'],
+				[{ type: 'invalid', sourceOpId: 'guard-1' }],
+				[{ key: 'ignored', title: 'Ignored' }],
+			],
+		);
+
+		expect(operations).toEqual([
+			{
+				opId: 'guard-1',
+				name: 'Guard',
+				description: 'Checks context',
+				kind: 'guard',
+				config: {
+					enabled: true,
+					required: false,
+					dependsOn: ['root'],
+					runConditions: [{ type: 'guard_output', sourceOpId: 'root', outputKey: 'battle', operator: 'is_true' }],
+					params: { outputContract: [{ key: 'battle', title: 'Battle' }] },
+				},
+			},
+			{
+				opId: 'llm-1',
+				name: 'LLM',
+				description: 'Writes text',
+				kind: 'llm',
+				config: {
+					enabled: false,
+					required: true,
+					dependsOn: ['guard-1'],
+					runConditions: [],
+					params: {},
+				},
+			},
+		]);
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/graph-form-state.ts b/web/src/features/sidebars/operation-profiles/node-editor/graph-form-state.ts
new file mode 100644
index 00000000..88939523
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/graph-form-state.ts
@@ -0,0 +1,86 @@
+import { isOperationKind } from '../utils/operation-kind';
+
+import type { FormRunCondition } from '../form/operation-profile-form-mapping';
+import type { OperationKind } from '@shared/types/operation-profiles';
+
+const GRAPH_OPERATION_FIELD_COUNT = 8;
+
+export type OperationGraphFormField = {
+	opId?: string;
+};
+
+export type OperationGraphFormState = {
+	opId: string;
+	name: string;
+	description: string;
+	kind: OperationKind;
+	config: {
+		enabled: boolean;
+		required: boolean;
+		dependsOn: string[];
+		runConditions: FormRunCondition[];
+		params: { outputContract?: unknown[] };
+	};
+};
+
+export function buildGraphWatchPaths(operationCount: number): string[] {
+	return Array.from({ length: operationCount }, (_, index) => [
+		`operations.${index}.name`,
+		`operations.${index}.description`,
+		`operations.${index}.kind`,
+		`operations.${index}.config.enabled`,
+		`operations.${index}.config.required`,
+		`operations.${index}.config.dependsOn`,
+		`operations.${index}.config.runConditions`,
+		`operations.${index}.config.params.outputContract`,
+	]).flat();
+}
+
+export function buildGraphOperations(
+	fields: OperationGraphFormField[],
+	watchedValues?: unknown[],
+): OperationGraphFormState[] {
+	return fields.map((field, index) => {
+		const base = index * GRAPH_OPERATION_FIELD_COUNT;
+		const kindValue = watchedValues?.[base + 2];
+		const kind = isOperationKind(kindValue) ? kindValue : 'template';
+		const outputContract = watchedValues?.[base + 7];
+
+		return {
+			opId: typeof field.opId === 'string' ? field.opId : '',
+			name: readString(watchedValues?.[base]),
+			description: readString(watchedValues?.[base + 1]),
+			kind,
+			config: {
+				enabled: Boolean(watchedValues?.[base + 3]),
+				required: Boolean(watchedValues?.[base + 4]),
+				dependsOn: readStringArray(watchedValues?.[base + 5]),
+				runConditions: readRunConditions(watchedValues?.[base + 6]),
+				params: kind === 'guard' ? { outputContract: Array.isArray(outputContract) ? outputContract : [] } : {},
+			},
+		};
+	});
+}
+
+function readString(value: unknown): string {
+	return typeof value === 'string' ? value : '';
+}
+
+function readStringArray(value: unknown): string[] {
+	return Array.isArray(value) ? value.filter((item): item is string => typeof item === 'string') : [];
+}
+
+function readRunConditions(value: unknown): FormRunCondition[] {
+	return Array.isArray(value)
+		? value.filter(
+				(item): item is FormRunCondition =>
+					Boolean(item) &&
+					typeof item === 'object' &&
+					(item as Record<string, unknown>).type === 'guard_output' &&
+					typeof (item as Record<string, unknown>).sourceOpId === 'string' &&
+					typeof (item as Record<string, unknown>).outputKey === 'string' &&
+					((item as Record<string, unknown>).operator === 'is_true' ||
+						(item as Record<string, unknown>).operator === 'is_false'),
+		  )
+		: [];
+}
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts
index 0366bccb..90d37a81 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts
+++ b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts
@@ -176,7 +176,6 @@ export function buildOperationGraphEdges(operations: OperationGraphSource[]): Ed
 				animated: false,
 				markerEnd: { type: MarkerType.ArrowClosed },
 				style: { strokeWidth: 2, stroke: 'var(--mantine-color-teal-6)' },
-				label: condition.operator === 'is_false' ? `${condition.outputKey} = false` : condition.outputKey,
 				data: {
 					kind: 'guard_output',
 					outputKey: condition.outputKey,
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx
new file mode 100644
index 00000000..eb8729b3
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import { useFormContext, useFormState } from 'react-hook-form';
+
+import { NodeEditorHeader } from './node-editor-header';
+
+import type { OperationProfileFormValues } from '../../form/operation-profile-form-mapping';
+
+type Props = {
+	profileName: string;
+	isLayoutDirty: boolean;
+	onAutoLayout: () => void;
+	onSave: () => void;
+	onClose: () => void;
+	isInspectorVisible?: boolean;
+	onToggleInspector?: () => void;
+	showInspectorToggle?: boolean;
+};
+
+export const NodeEditorFormHeader: React.FC<Props> = ({
+	profileName,
+	isLayoutDirty,
+	onAutoLayout,
+	onSave,
+	onClose,
+	isInspectorVisible,
+	onToggleInspector,
+	showInspectorToggle,
+}) => {
+	const { control } = useFormContext<OperationProfileFormValues>();
+	const { isDirty: isFormDirty } = useFormState({ control });
+
+	return (
+		<NodeEditorHeader
+			profileName={profileName}
+			isDirty={isLayoutDirty || isFormDirty}
+			onAutoLayout={onAutoLayout}
+			onSave={onSave}
+			onClose={onClose}
+			isInspectorVisible={isInspectorVisible}
+			onToggleInspector={onToggleInspector}
+			showInspectorToggle={showInspectorToggle}
+		/>
+	);
+};
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-graph-panel.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-graph-panel.tsx
new file mode 100644
index 00000000..f369f51a
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-graph-panel.tsx
@@ -0,0 +1,171 @@
+import { Button, Group, Select, Stack } from '@mantine/core';
+import {
+	Background,
+	ConnectionLineType,
+	Controls,
+	type Connection,
+	type Edge,
+	type EdgeChange,
+	type Node,
+	type NodeChange,
+	Panel,
+	ReactFlow,
+	ReactFlowProvider,
+	type ReactFlowInstance,
+} from '@xyflow/react';
+import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { LuPlus, LuTrash2 } from 'react-icons/lu';
+
+import { OperationFlowNode, type OperationFlowNodeData } from '../flow/operation-flow-node';
+
+import { GroupOverlays, type EditorGroup } from './group-overlays';
+
+type Props = {
+	flowWrapperRef: React.RefObject<HTMLDivElement | null>;
+	nodes: Array<Node<OperationFlowNodeData>>;
+	edges: Edge[];
+	onInit: React.Dispatch<React.SetStateAction<ReactFlowInstance | null>>;
+	onConnect: (connection: Connection) => void;
+	onConnectStart: (
+		event: unknown,
+		params: { nodeId?: string | null; handleType?: 'source' | 'target' | null; handleId?: string | null },
+	) => void;
+	onConnectEnd: (event: MouseEvent | TouchEvent) => void;
+	onEdgesChange: (changes: EdgeChange[]) => void;
+	onNodesChange: (changes: NodeChange[]) => void;
+	onNodeDragStop: (event: unknown, node: Node) => void;
+	onSelectionChange: (selection: { nodes: Array<{ id: string | number }> }) => void;
+	onNodeClick: (event: unknown, node: Node) => void;
+	onPaneClick: () => void;
+	groups: Record<string, EditorGroup>;
+	selectedGroupId: string | null;
+	groupBgAlpha: number;
+	computeGroupBounds: (nodeIds: string[]) => { x: number; y: number; width: number; height: number } | null;
+	onGroupLabelPointerDown: (event: React.PointerEvent, groupId: string) => void;
+	onGroupLabelPointerMove: (event: React.PointerEvent) => void;
+	onGroupLabelPointerUp: (event: React.PointerEvent, groupId: string) => void;
+	onAddOperation: () => void;
+	onDeleteSelected: () => void;
+	onCreateGroup: () => void;
+	selectedNodeCount: number;
+	hasSelectedOperation: boolean;
+	groupOptions: Array<{ value: string; label: string }>;
+	onSelectedGroupChange: (value: string | null) => void;
+	onUngroup: () => void;
+};
+
+const NODE_TYPES = { operation: OperationFlowNode };
+
+export const NodeEditorGraphPanel: React.FC<Props> = memo(
+	({
+		flowWrapperRef,
+		nodes,
+		edges,
+		onInit,
+		onConnect,
+		onConnectStart,
+		onConnectEnd,
+		onEdgesChange,
+		onNodesChange,
+		onNodeDragStop,
+		onSelectionChange,
+		onNodeClick,
+		onPaneClick,
+		groups,
+		selectedGroupId,
+		groupBgAlpha,
+		computeGroupBounds,
+		onGroupLabelPointerDown,
+		onGroupLabelPointerMove,
+		onGroupLabelPointerUp,
+		onAddOperation,
+		onDeleteSelected,
+		onCreateGroup,
+		selectedNodeCount,
+		hasSelectedOperation,
+		groupOptions,
+		onSelectedGroupChange,
+		onUngroup,
+	}) => {
+		const { t } = useTranslation();
+
+		return (
+			<div ref={flowWrapperRef} className="opProfileNodeEditorFlow opNodePanel" style={{ flex: 1, minHeight: 0 }}>
+				<ReactFlowProvider>
+					<ReactFlow
+						nodes={nodes}
+						edges={edges}
+						nodeTypes={NODE_TYPES}
+						connectionLineType={ConnectionLineType.SmoothStep}
+						onInit={onInit}
+						onConnect={onConnect}
+						onConnectStart={onConnectStart}
+						onConnectEnd={onConnectEnd}
+						onEdgesChange={onEdgesChange}
+						onNodesChange={onNodesChange}
+						onNodeDragStop={onNodeDragStop}
+						selectionOnDrag
+						selectionKeyCode={['Shift']}
+						multiSelectionKeyCode={['Control', 'Meta', 'Shift']}
+						deleteKeyCode={null}
+						onSelectionChange={onSelectionChange as never}
+						onNodeClick={onNodeClick}
+						onPaneClick={onPaneClick}
+					>
+						<Background />
+						<Controls />
+						<GroupOverlays
+							groups={groups}
+							selectedGroupId={selectedGroupId}
+							groupBgAlpha={groupBgAlpha}
+							computeBounds={computeGroupBounds}
+							onLabelPointerDown={onGroupLabelPointerDown}
+							onLabelPointerMove={onGroupLabelPointerMove}
+							onLabelPointerUp={onGroupLabelPointerUp}
+						/>
+						<Panel position="top-left">
+							<Stack gap={6} className="opNodeToolbar">
+								<Group gap="xs" wrap="nowrap">
+									<Button size="xs" leftSection={<LuPlus />} onClick={onAddOperation}>
+										{t('common.add')}
+									</Button>
+									<Button
+										size="xs"
+										color="red"
+										variant="light"
+										leftSection={<LuTrash2 />}
+										disabled={selectedNodeCount === 0 && !hasSelectedOperation}
+										onClick={onDeleteSelected}
+									>
+										{t('common.delete')}
+									</Button>
+									<Button size="xs" variant="light" disabled={selectedNodeCount < 2} onClick={onCreateGroup}>
+										{t('operationProfiles.actions.group')}
+									</Button>
+								</Group>
+
+								<Group gap="xs" wrap="nowrap">
+									<Select
+										size="xs"
+										placeholder={t('operationProfiles.nodeEditor.groupsPlaceholder')}
+										data={groupOptions}
+										value={selectedGroupId ?? ''}
+										onChange={(value) => onSelectedGroupChange(value && value !== '' ? value : null)}
+										comboboxProps={{ withinPortal: false }}
+										style={{ minWidth: 200 }}
+									/>
+									<Button size="xs" variant="default" disabled={!selectedGroupId} onClick={onUngroup}>
+										{t('operationProfiles.actions.ungroup')}
+									</Button>
+								</Group>
+							</Stack>
+						</Panel>
+					</ReactFlow>
+				</ReactFlowProvider>
+			</div>
+		);
+	},
+);
+
+NodeEditorGraphPanel.displayName = 'NodeEditorGraphPanel';
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-inspector-panel.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-inspector-panel.tsx
new file mode 100644
index 00000000..706efb89
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-inspector-panel.tsx
@@ -0,0 +1,72 @@
+import { Group, ScrollArea, Stack, Text } from '@mantine/core';
+import React from 'react';
+import { useFormContext, useFormState } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+
+import { OperationEditor } from '../../ui/operation-editor/operation-editor';
+
+import type { OperationProfileFormValues } from '../../form/operation-profile-form-mapping';
+import type { OperationKind } from '@shared/types/operation-profiles';
+
+type Props = {
+	selectedIndex: number | null;
+	selectedOpId: string | null;
+	selectedKind: OperationKind;
+	isCompactLayout: boolean;
+	isLayoutDirty: boolean;
+	onSave: () => void;
+	onDiscard: () => void;
+	onRemove: () => void;
+};
+
+export const NodeEditorInspectorPanel: React.FC<Props> = ({
+	selectedIndex,
+	selectedOpId,
+	selectedKind,
+	isCompactLayout,
+	isLayoutDirty,
+	onSave,
+	onDiscard,
+	onRemove,
+}) => {
+	const { t } = useTranslation();
+	const { control } = useFormContext<OperationProfileFormValues>();
+	const { isDirty: isFormDirty } = useFormState({ control });
+	const isDirty = isLayoutDirty || isFormDirty;
+
+	return (
+		<ScrollArea className="opNodePanel" style={{ width: isCompactLayout ? '100%' : 480, height: '100%' }} p="md">
+			<Stack gap="md" className="opNodeInspector">
+				<div className="opNodeInspectorHeader">
+					<Group justify="space-between" wrap="nowrap">
+						<Text fw={800}>{t('operationProfiles.operationEditor.title')}</Text>
+						<Text size="xs" c="dimmed">
+							{selectedIndex === null ? '—' : `#${selectedIndex + 1}`}
+						</Text>
+					</Group>
+				</div>
+
+				{selectedIndex === null ? (
+					<Text size="sm" c="dimmed">
+						{t('operationProfiles.nodeEditor.selectNode')}
+					</Text>
+				) : (
+					<OperationEditor
+						key={selectedOpId ?? String(selectedIndex)}
+						index={selectedIndex}
+						status={{
+							index: selectedIndex + 1,
+							kind: selectedKind,
+							isDirty,
+						}}
+						canSave={isDirty}
+						canDiscard={isDirty}
+						onSave={onSave}
+						onDiscard={onDiscard}
+						onRemove={onRemove}
+					/>
+				)}
+			</Stack>
+		</ScrollArea>
+	);
+};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/execution-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/execution-section.tsx
index a545a147..b19f79b0 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/execution-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/execution-section.tsx
@@ -37,9 +37,17 @@ export const ExecutionSection: React.FC<Props> = ({ index }) => {
 		keyName: '_key',
 	});
 
-	const namePaths = useMemo(() => fields.map((_, idx) => `operations.${idx}.name`), [fields]);
-	const watchedNames = useWatch({ control, name: namePaths as any }) as unknown[] | undefined;
-	const watchedOperations = useWatch({ control, name: 'operations' }) as OperationProfileFormValues['operations'] | undefined;
+	const operationMetaPaths = useMemo(
+		() =>
+			fields.flatMap((_, idx) => [
+				`operations.${idx}.name`,
+				`operations.${idx}.kind`,
+				`operations.${idx}.opId`,
+				`operations.${idx}.config.params.outputContract`,
+			]),
+		[fields],
+	);
+	const watchedOperationMeta = useWatch({ control, name: operationMetaPaths as any }) as unknown[] | undefined;
 	const runConditionSourcePaths = useMemo(
 		() => runConditionsArray.fields.map((_, conditionIndex) => `operations.${index}.config.runConditions.${conditionIndex}.sourceOpId`),
 		[index, runConditionsArray.fields],
@@ -48,31 +56,33 @@ export const ExecutionSection: React.FC<Props> = ({ index }) => {
 
 	const depOptions = useMemo(() => {
 		return fields
-			.map((field, idx) => {
-				const opId = typeof field.opId === 'string' ? field.opId : '';
+			.map((_field, idx) => {
+				const opId = typeof watchedOperationMeta?.[idx * 4 + 2] === 'string' ? watchedOperationMeta[idx * 4 + 2] : '';
 				if (!opId) return null;
-				const nameValue = watchedNames?.[idx];
+				const nameValue = watchedOperationMeta?.[idx * 4];
 				const name = typeof nameValue === 'string' ? nameValue : '';
 				return { value: opId, label: name.trim() ? `${name} — ${opId}` : opId };
 			})
 			.filter((option): option is { value: string; label: string } => option !== null);
-	}, [fields, watchedNames]);
+	}, [fields, watchedOperationMeta]);
 
-	const selfOpId = useWatch({ name: `operations.${index}.opId` }) as unknown;
-	const selfId = typeof selfOpId === 'string' ? selfOpId : '';
+	const selfId = typeof watchedOperationMeta?.[index * 4 + 2] === 'string' ? watchedOperationMeta[index * 4 + 2] : '';
 	const guardOptions = useMemo(() => {
-		return (watchedOperations ?? [])
-			.map((operation, operationIndex) => {
-				if (operation.opId === selfId || operation.kind !== 'guard') return null;
-				const nameValue = watchedNames?.[operationIndex];
-				const name = typeof nameValue === 'string' ? nameValue : operation.name;
+		return fields
+			.map((_, operationIndex) => {
+				const nameValue = watchedOperationMeta?.[operationIndex * 4];
+				const kindValue = watchedOperationMeta?.[operationIndex * 4 + 1];
+				const opIdValue = watchedOperationMeta?.[operationIndex * 4 + 2];
+				const opId = typeof opIdValue === 'string' ? opIdValue : '';
+				if (!opId || opId === selfId || kindValue !== 'guard') return null;
+				const name = typeof nameValue === 'string' ? nameValue : '';
 				return {
-					value: operation.opId,
-					label: name.trim() ? `${name} — ${operation.opId}` : operation.opId,
+					value: opId,
+					label: name.trim() ? `${name} — ${opId}` : opId,
 				};
 			})
 			.filter((option): option is { value: string; label: string } => option !== null);
-	}, [selfId, watchedNames, watchedOperations]);
+	}, [fields, selfId, watchedOperationMeta]);
 
 	return (
 		<Stack gap="xs">
@@ -165,19 +175,24 @@ export const ExecutionSection: React.FC<Props> = ({ index }) => {
 							{t('operationProfiles.execution.runConditionsEmpty')}
 						</Text>
 					) : (
-						runConditionsArray.fields.map((field, conditionIndex) => {
+						runConditionsArray.fields.map((conditionField, conditionIndex) => {
 							const selectedSourceId =
 								typeof watchedRunConditionSources?.[conditionIndex] === 'string'
 									? watchedRunConditionSources[conditionIndex]
 									: '';
-							const sourceOperation = (watchedOperations ?? []).find((operation) => operation.opId === selectedSourceId);
-							const outputOptions = readGuardOutputContract(sourceOperation?.config.params).map((output) => ({
+							const sourceIndex = fields.findIndex((operationField, operationIndex) => {
+								const opIdValue = watchedOperationMeta?.[operationIndex * 4 + 2];
+								return typeof opIdValue === 'string' && opIdValue === selectedSourceId && operationField.opId;
+							});
+							const outputOptions = readGuardOutputContract({
+								outputContract: sourceIndex >= 0 ? watchedOperationMeta?.[sourceIndex * 4 + 3] : [],
+							}).map((output) => ({
 								value: output.key,
 								label: output.title || output.key,
 							}));
 
 							return (
-								<Paper key={field._key} withBorder p="sm">
+								<Paper key={conditionField._key} withBorder p="sm">
 									<Stack gap="xs">
 										<Group justify="space-between" align="center">
 											<Text fw={600}>{t('operationProfiles.execution.runConditionLabel', { index: conditionIndex + 1 })}</Text>

From a1bceeef1cf9b46cd133bb83a779ac7dae43f53f Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sun, 15 Mar 2026 22:13:43 +0300
Subject: [PATCH 20/54] fix: save errors

---
 web/src/api/api-error.test.ts |  71 ++++++++++++++++++++++
 web/src/api/api-error.ts      | 108 ++++++++++++++++++++++++++++++++++
 web/src/api/chat-core.ts      |  10 ++--
 3 files changed, 185 insertions(+), 4 deletions(-)
 create mode 100644 web/src/api/api-error.test.ts
 create mode 100644 web/src/api/api-error.ts

diff --git a/web/src/api/api-error.test.ts b/web/src/api/api-error.test.ts
new file mode 100644
index 00000000..195758f6
--- /dev/null
+++ b/web/src/api/api-error.test.ts
@@ -0,0 +1,71 @@
+import { describe, expect, it } from 'vitest';
+
+import { getApiErrorMessage } from './api-error';
+
+describe('getApiErrorMessage', () => {
+	it('formats flat zod issues into a readable message', () => {
+		const message = getApiErrorMessage(
+			{
+				error: {
+					message: 'Validation error',
+					code: 'VALIDATION_ERROR',
+					details: {
+						issues: [
+							{
+								path: ['operations', 0, 'config', 'activation'],
+								message: 'activation must include at least one interval',
+							},
+						],
+					},
+				},
+			},
+			400,
+		);
+
+		expect(message).toBe('operations[0].config.activation: activation must include at least one interval');
+	});
+
+	it('formats request validation issues grouped by source', () => {
+		const message = getApiErrorMessage(
+			{
+				error: {
+					message: 'Validation error',
+					code: 'VALIDATION_ERROR',
+					details: {
+						issues: [
+							{
+								source: 'body',
+								issues: [
+									{
+										path: ['input', 'name'],
+										message: 'Too small: expected string to have >=1 characters',
+									},
+								],
+							},
+						],
+					},
+				},
+			},
+			400,
+		);
+
+		expect(message).toBe('body.input.name: Too small: expected string to have >=1 characters');
+	});
+
+	it('keeps specific non-validation messages', () => {
+		const message = getApiErrorMessage(
+			{
+				error: {
+					message: 'Unknown blockId in profile',
+					code: 'VALIDATION_ERROR',
+					details: {
+						blockId: 'missing-block',
+					},
+				},
+			},
+			400,
+		);
+
+		expect(message).toBe('Unknown blockId in profile');
+	});
+});
diff --git a/web/src/api/api-error.ts b/web/src/api/api-error.ts
new file mode 100644
index 00000000..8dacb34a
--- /dev/null
+++ b/web/src/api/api-error.ts
@@ -0,0 +1,108 @@
+type ApiErrorEnvelope = {
+	error?: {
+		message?: string;
+		code?: string;
+		details?: unknown;
+	};
+};
+
+type ApiIssue = {
+	path?: unknown[];
+	message?: string;
+};
+
+type ApiIssueGroup = {
+	source?: string;
+	issues?: ApiIssue[];
+};
+
+const GENERIC_VALIDATION_MESSAGE = 'validation error';
+const MAX_ISSUES_IN_MESSAGE = 3;
+
+export function getApiErrorMessage(body: ApiErrorEnvelope | undefined, status: number): string {
+	const fallbackMessage = body?.error?.message ?? `HTTP error ${status}`;
+	const validationDetails = formatValidationDetails(body?.error?.details);
+
+	if (!validationDetails) {
+		return fallbackMessage;
+	}
+
+	const serverMessage = body?.error?.message?.trim();
+	if (!serverMessage || serverMessage.toLowerCase() === GENERIC_VALIDATION_MESSAGE) {
+		return validationDetails;
+	}
+
+	if (serverMessage.includes(validationDetails)) {
+		return serverMessage;
+	}
+
+	return `${serverMessage}: ${validationDetails}`;
+}
+
+function formatValidationDetails(details: unknown): string | null {
+	if (!isRecord(details) || !Array.isArray(details.issues) || details.issues.length === 0) {
+		return null;
+	}
+
+	const formattedIssues = details.issues
+		.flatMap((issue) => {
+			if (isIssueGroup(issue)) {
+				return (issue.issues ?? []).map((nestedIssue) => formatIssue(nestedIssue, issue.source));
+			}
+
+			if (isIssue(issue)) {
+				return [formatIssue(issue)];
+			}
+
+			return [];
+		})
+		.filter((issue): issue is string => typeof issue === 'string' && issue.length > 0);
+
+	if (formattedIssues.length === 0) {
+		return null;
+	}
+
+	const visibleIssues = formattedIssues.slice(0, MAX_ISSUES_IN_MESSAGE);
+	const remainingCount = formattedIssues.length - visibleIssues.length;
+
+	return remainingCount > 0 ? `${visibleIssues.join('; ')}; +${remainingCount} more` : visibleIssues.join('; ');
+}
+
+function formatIssue(issue: ApiIssue, source?: string): string | null {
+	const message = typeof issue.message === 'string' ? issue.message.trim() : '';
+	if (!message) {
+		return null;
+	}
+
+	const path = formatIssuePath(issue.path, source);
+	return path ? `${path}: ${message}` : message;
+}
+
+function formatIssuePath(path: unknown[] | undefined, source?: string): string | null {
+	let result = typeof source === 'string' && source.length > 0 ? source : '';
+
+	for (const segment of path ?? []) {
+		if (typeof segment === 'number' && Number.isInteger(segment)) {
+			result += `[${segment}]`;
+			continue;
+		}
+
+		if (typeof segment === 'string' && segment.length > 0) {
+			result += result ? `.${segment}` : segment;
+		}
+	}
+
+	return result || null;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return typeof value === 'object' && value !== null;
+}
+
+function isIssue(value: unknown): value is ApiIssue {
+	return isRecord(value);
+}
+
+function isIssueGroup(value: unknown): value is ApiIssueGroup {
+	return isRecord(value) && Array.isArray(value.issues);
+}
diff --git a/web/src/api/chat-core.ts b/web/src/api/chat-core.ts
index 6860ac95..d2fe3ca4 100644
--- a/web/src/api/chat-core.ts
+++ b/web/src/api/chat-core.ts
@@ -1,5 +1,7 @@
 import { BASE_URL } from '../const';
 
+import { getApiErrorMessage } from './api-error';
+
 import type {
 	OperationBlock,
 	OperationBlockExport,
@@ -24,11 +26,11 @@ async function apiJson<T>(path: string, init?: RequestInit): Promise<T> {
 	});
 
 	const body = (await res.json().catch(() => ({}))) as Partial<ApiEnvelope<T>> & {
-		error?: { message?: string };
+		error?: { message?: string; code?: string; details?: unknown };
 	};
 
 	if (!res.ok) {
-		const message = body?.error?.message ?? `HTTP error ${res.status}`;
+		const message = getApiErrorMessage(body, res.status);
 		throw new Error(message);
 	}
 
@@ -43,11 +45,11 @@ async function apiForm<T>(path: string, form: FormData, init?: Omit<RequestInit,
 	});
 
 	const body = (await res.json().catch(() => ({}))) as Partial<ApiEnvelope<T>> & {
-		error?: { message?: string };
+		error?: { message?: string; code?: string; details?: unknown };
 	};
 
 	if (!res.ok) {
-		const message = body?.error?.message ?? `HTTP error ${res.status}`;
+		const message = getApiErrorMessage(body, res.status);
 		throw new Error(message);
 	}
 

From b63f106c34dbcf5af6013f7b7e0aa7702fcda84e Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sun, 15 Mar 2026 23:36:58 +0300
Subject: [PATCH 21/54] fix: up aux llm operations

---
 .../llm-provider/llm-token-manager-dialog.tsx | 183 ++++++++++++++
 .../llm-provider/runtime-selector-fields.tsx  |   4 +-
 .../features/llm-provider/token-manager.tsx   | 206 +++------------
 .../form/guard-kind-form.ts                   |  26 +-
 .../form/operation-llm-form-utils.test.ts     | 121 +++++++++
 .../form/operation-llm-form-utils.ts          |  68 +++++
 .../operation-profile-form-mapping.test.ts    |  73 ++++++
 .../form/operation-profile-form-mapping.ts    |  31 ++-
 .../flow/operation-flow-node-model.test.ts    |   3 +
 .../node-editor/operation-graph.test.ts       |   3 +
 .../kind-params/guard-kind-section.tsx        |  39 +--
 .../sections/kind-params/llm-kind-section.tsx | 235 +-----------------
 .../shared/operation-llm-config-controls.tsx  | 224 +++++++++++++++++
 .../shared/operation-llm-preset-manager.tsx   | 151 +++++++++++
 .../shared/operation-llm-runtime-dialog.tsx   | 136 ++++++++++
 .../shared/operation-sampler-dialog.tsx       |  80 ++++++
 .../i18n/resources/en/operationProfiles.ts    |  18 +-
 .../i18n/resources/ru/operationProfiles.ts    |  18 +-
 18 files changed, 1165 insertions(+), 454 deletions(-)
 create mode 100644 web/src/features/llm-provider/llm-token-manager-dialog.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-config-controls.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-preset-manager.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-runtime-dialog.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-sampler-dialog.tsx

diff --git a/web/src/features/llm-provider/llm-token-manager-dialog.tsx b/web/src/features/llm-provider/llm-token-manager-dialog.tsx
new file mode 100644
index 00000000..fcb1b46c
--- /dev/null
+++ b/web/src/features/llm-provider/llm-token-manager-dialog.tsx
@@ -0,0 +1,183 @@
+import { Button, Divider, Flex, PasswordInput, Stack, Text, TextInput } from '@mantine/core';
+import { useUnit } from 'effector-react';
+import { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { llmProviderModel } from '@model/provider';
+import { Dialog } from '@ui/dialog';
+
+import type { LlmProviderId } from '@shared/types/llm';
+
+type Props = {
+	open: boolean;
+	onOpenChange: (open: boolean) => void;
+	providerId: LlmProviderId;
+	activeTokenId?: string | null;
+	onTokenSelected?: (tokenId: string | null) => void;
+};
+
+export const LlmTokenManagerDialog: React.FC<Props> = ({
+	open,
+	onOpenChange,
+	providerId,
+	activeTokenId = null,
+	onTokenSelected,
+}) => {
+	const { t } = useTranslation();
+	const [tokensByProviderId, createTokenFx, patchTokenFx, deleteTokenFx, loadTokensFx] = useUnit([
+		llmProviderModel.$tokensByProviderId,
+		llmProviderModel.createTokenFx,
+		llmProviderModel.patchTokenFx,
+		llmProviderModel.deleteTokenFx,
+		llmProviderModel.loadTokensFx,
+	]);
+
+	const tokens = useMemo(() => tokensByProviderId[providerId] ?? [], [providerId, tokensByProviderId]);
+	const [newName, setNewName] = useState('');
+	const [newToken, setNewToken] = useState('');
+	const [editingId, setEditingId] = useState<string | null>(null);
+	const editing = useMemo(() => tokens.find((item) => item.id === editingId) ?? null, [editingId, tokens]);
+	const [editName, setEditName] = useState('');
+	const [editToken, setEditToken] = useState('');
+
+	const resetDrafts = () => {
+		setEditingId(null);
+		setNewName('');
+		setNewToken('');
+		setEditName('');
+		setEditToken('');
+	};
+
+	const handleOpenChange = (nextOpen: boolean) => {
+		onOpenChange(nextOpen);
+		if (nextOpen) return;
+		resetDrafts();
+	};
+
+	const startEdit = (tokenId: string) => {
+		const token = tokens.find((item) => item.id === tokenId);
+		if (!token) return;
+		setEditingId(tokenId);
+		setEditName(token.name);
+		setEditToken('');
+	};
+
+	const submitCreate = async () => {
+		const name = newName.trim();
+		const token = newToken.trim();
+		if (!name || !token) return;
+
+		const created = await createTokenFx({ providerId, name, token });
+		await loadTokensFx(providerId);
+		onTokenSelected?.(created.id);
+		setNewName('');
+		setNewToken('');
+	};
+
+	const submitEdit = async () => {
+		if (!editingId) return;
+		await patchTokenFx({
+			id: editingId,
+			name: editName.trim() || undefined,
+			token: editToken.trim() || undefined,
+		});
+		await loadTokensFx(providerId);
+		setEditingId(null);
+		setEditToken('');
+	};
+
+	const submitDelete = async (tokenId: string) => {
+		await deleteTokenFx(tokenId);
+		await loadTokensFx(providerId);
+		if (tokenId === activeTokenId) {
+			onTokenSelected?.(null);
+		}
+	};
+
+	return (
+		<Dialog
+			open={open}
+			onOpenChange={handleOpenChange}
+			title={t('tokenManager.title')}
+			size="lg"
+			footer={
+				<Flex justify="flex-end" gap={2}>
+					<Button variant="subtle" onClick={() => handleOpenChange(false)}>
+						{t('common.close')}
+					</Button>
+				</Flex>
+			}
+			showCloseButton
+			closeOnEscape
+			closeOnInteractOutside
+		>
+			<Stack gap="sm">
+				<Text fw={600}>{t('tokenManager.addToken')}</Text>
+				<Stack gap="xs">
+					<TextInput placeholder={t('tokenManager.fields.name')} value={newName} onChange={(event) => setNewName(event.currentTarget.value)} />
+					<PasswordInput
+						placeholder={t('tokenManager.fields.token')}
+						value={newToken}
+						onChange={(event) => setNewToken(event.currentTarget.value)}
+					/>
+					<Flex justify="flex-end">
+						<Button onClick={submitCreate} disabled={!newName.trim() || !newToken.trim()}>
+							{t('common.add')}
+						</Button>
+					</Flex>
+				</Stack>
+
+				<Divider />
+
+				<Text fw={600}>{t('tokenManager.tokensFor', { providerId })}</Text>
+
+				{tokens.length === 0 ? (
+					<Text c="dimmed">{t('tokenManager.empty')}</Text>
+				) : (
+					<Stack gap="xs">
+						{tokens.map((token) => (
+							<Flex key={token.id} gap={2} align="center" justify="space-between">
+								<Stack gap={0} style={{ minWidth: 0 }}>
+									<Text fw={500}>
+										{token.name} {token.id === activeTokenId ? t('tokenManager.activeSuffix') : ''}
+									</Text>
+									<Text size="sm" c="dimmed">
+										{token.tokenHint}
+									</Text>
+								</Stack>
+								<Flex gap={2}>
+									<Button size="sm" variant="outline" onClick={() => startEdit(token.id)}>
+										{t('common.edit')}
+									</Button>
+									<Button size="sm" variant="outline" color="red" onClick={() => void submitDelete(token.id)}>
+										{t('common.delete')}
+									</Button>
+								</Flex>
+							</Flex>
+						))}
+					</Stack>
+				)}
+
+				{editing ? (
+					<Stack gap="xs" mt="md" p="md" style={{ border: '1px solid var(--mantine-color-gray-3)', borderRadius: 8 }}>
+						<Text fw={600}>{t('tokenManager.editToken')}</Text>
+						<TextInput value={editName} onChange={(event) => setEditName(event.currentTarget.value)} placeholder={t('tokenManager.fields.name')} />
+						<PasswordInput
+							value={editToken}
+							onChange={(event) => setEditToken(event.currentTarget.value)}
+							placeholder={t('tokenManager.fields.newTokenPlaceholder', { hint: editing.tokenHint })}
+						/>
+						<Flex justify="flex-end" gap={2}>
+							<Button variant="subtle" onClick={() => setEditingId(null)}>
+								{t('common.cancel')}
+							</Button>
+							<Button onClick={submitEdit} disabled={!editName.trim() && !editToken.trim()}>
+								{t('common.save')}
+							</Button>
+						</Flex>
+					</Stack>
+				) : null}
+			</Stack>
+		</Dialog>
+	);
+};
diff --git a/web/src/features/llm-provider/runtime-selector-fields.tsx b/web/src/features/llm-provider/runtime-selector-fields.tsx
index bfa70f84..bc8657f1 100644
--- a/web/src/features/llm-provider/runtime-selector-fields.tsx
+++ b/web/src/features/llm-provider/runtime-selector-fields.tsx
@@ -28,6 +28,7 @@ type Props = {
 	onModelSelect: (model: string | null) => void;
 	onLoadModels: () => Promise<void>;
 	allowTokenManager?: boolean;
+	showInlineTokenManager?: boolean;
 	tokenManagerScope?: LlmScope;
 	tokenManagerScopeId?: string;
 	onOpenTokenManager?: (open: boolean) => void;
@@ -45,6 +46,7 @@ export const LlmRuntimeSelectorFields: React.FC<Props> = ({
 	onModelSelect,
 	onLoadModels,
 	allowTokenManager = false,
+	showInlineTokenManager = true,
 	tokenManagerScope,
 	tokenManagerScopeId,
 	onOpenTokenManager,
@@ -132,7 +134,7 @@ export const LlmRuntimeSelectorFields: React.FC<Props> = ({
 					searchable
 					comboboxProps={{ withinPortal: false }}
 				/>
-				{allowTokenManager && tokenManagerScope && tokenManagerScopeId ? (
+				{allowTokenManager && showInlineTokenManager && tokenManagerScope && tokenManagerScopeId ? (
 					<TokenManager providerId={activeProviderId} scope={tokenManagerScope} scopeId={tokenManagerScopeId} />
 				) : null}
 			</Stack>
diff --git a/web/src/features/llm-provider/token-manager.tsx b/web/src/features/llm-provider/token-manager.tsx
index 58de9161..c52140f9 100644
--- a/web/src/features/llm-provider/token-manager.tsx
+++ b/web/src/features/llm-provider/token-manager.tsx
@@ -1,185 +1,37 @@
-import { Button, Divider, Flex, PasswordInput, Stack, Text, TextInput } from "@mantine/core";
-import { useUnit } from "effector-react";
-import { useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
+import { useUnit } from 'effector-react';
+import { useMemo } from 'react';
 
-import { llmProviderModel } from "@model/provider";
-import { Dialog } from "@ui/dialog";
+import { llmProviderModel } from '@model/provider';
 
-import type { LlmProviderId, LlmScope } from "@shared/types/llm";
+import { LlmTokenManagerDialog } from './llm-token-manager-dialog';
+
+import type { LlmProviderId, LlmScope } from '@shared/types/llm';
 
 type Props = {
-  providerId: LlmProviderId;
-  scope: LlmScope;
-  scopeId: string;
+	providerId: LlmProviderId;
+	scope: LlmScope;
+	scopeId: string;
 };
 
 export const TokenManager: React.FC<Props> = ({ providerId, scope, scopeId }) => {
-  const { t } = useTranslation();
-  const [
-    isOpen,
-    setOpen,
-    tokensByProviderId,
-    runtimeByKey,
-    createTokenFx,
-    patchTokenFx,
-    deleteTokenFx,
-    loadTokensFx,
-  ] = useUnit([
-    llmProviderModel.$isTokenManagerOpen,
-    llmProviderModel.tokenManagerOpened,
-    llmProviderModel.$tokensByProviderId,
-    llmProviderModel.$runtimeByScopeKey,
-    llmProviderModel.createTokenFx,
-    llmProviderModel.patchTokenFx,
-    llmProviderModel.deleteTokenFx,
-    llmProviderModel.loadTokensFx,
-  ]);
-
-  const scopeKey = `${scope}:${scopeId}` as const;
-  const runtime = runtimeByKey[scopeKey];
-  const activeTokenId = runtime?.activeTokenId ?? null;
-  const tokens = useMemo(
-    () => tokensByProviderId[providerId] ?? [],
-    [tokensByProviderId, providerId]
-  );
-
-  const [newName, setNewName] = useState("");
-  const [newToken, setNewToken] = useState("");
-
-  const [editingId, setEditingId] = useState<string | null>(null);
-  const editing = useMemo(() => tokens.find((t) => t.id === editingId) ?? null, [tokens, editingId]);
-  const [editName, setEditName] = useState("");
-  const [editToken, setEditToken] = useState("");
-
-  const handleOpenChange = (open: boolean) => {
-    setOpen(open);
-    if (open) return;
-    setEditingId(null);
-    setNewName("");
-    setNewToken("");
-  };
-
-  const startEdit = (id: string) => {
-    const token = tokens.find((t) => t.id === id);
-    if (!token) return;
-    setEditingId(id);
-    setEditName(token.name);
-    setEditToken("");
-  };
-
-  const submitCreate = async () => {
-    const name = newName.trim();
-    const token = newToken.trim();
-    if (!name || !token) return;
-
-    const created = await createTokenFx({ providerId, name, token });
-    setNewName("");
-    setNewToken("");
-    await loadTokensFx(providerId);
-
-    llmProviderModel.tokenSelected({ scope, scopeId, tokenId: created.id });
-  };
-
-  const submitEdit = async () => {
-    if (!editingId) return;
-    const name = editName.trim();
-    const token = editToken.trim();
-    await patchTokenFx({ id: editingId, name: name || undefined, token: token || undefined });
-    setEditingId(null);
-    setEditToken("");
-    await loadTokensFx(providerId);
-  };
-
-  const submitDelete = async (id: string) => {
-    await deleteTokenFx(id);
-    await loadTokensFx(providerId);
-    if (id === activeTokenId) {
-      llmProviderModel.tokenSelected({ scope, scopeId, tokenId: null });
-    }
-  };
-
-  return (
-    <Dialog
-      open={isOpen}
-      onOpenChange={handleOpenChange}
-      title={t("tokenManager.title")}
-      size="lg"
-      footer={
-        <Flex justify="flex-end" gap={2}>
-          <Button variant="subtle" onClick={() => handleOpenChange(false)}>
-            {t("common.close")}
-          </Button>
-        </Flex>
-      }
-      showCloseButton
-      closeOnEscape
-      closeOnInteractOutside
-    >
-      <Stack gap="sm">
-        <Text fw={600}>{t("tokenManager.addToken")}</Text>
-        <Stack gap="xs">
-          <TextInput placeholder={t("tokenManager.fields.name")} value={newName} onChange={(e) => setNewName(e.currentTarget.value)} />
-          <PasswordInput placeholder={t("tokenManager.fields.token")} value={newToken} onChange={(e) => setNewToken(e.currentTarget.value)} />
-          <Flex justify="flex-end">
-            <Button onClick={submitCreate} disabled={!newName.trim() || !newToken.trim()}>
-              {t("common.add")}
-            </Button>
-          </Flex>
-        </Stack>
-
-        <Divider />
-
-        <Text fw={600}>{t("tokenManager.tokensFor", { providerId })}</Text>
-
-        {tokens.length === 0 ? (
-          <Text c="dimmed">{t("tokenManager.empty")}</Text>
-        ) : (
-          <Stack gap="xs">
-            {tokens.map((token) => (
-              <Flex key={token.id} gap={2} align="center" justify="space-between">
-                <Stack gap={0} style={{ minWidth: 0 }}>
-                  <Text fw={500}>
-                    {token.name} {token.id === activeTokenId ? t("tokenManager.activeSuffix") : ""}
-                  </Text>
-                  <Text size="sm" c="dimmed">
-                    {token.tokenHint}
-                  </Text>
-                </Stack>
-                <Flex gap={2}>
-                  <Button size="sm" variant="outline" onClick={() => startEdit(token.id)}>
-                    {t("common.edit")}
-                  </Button>
-                  <Button size="sm" variant="outline" color="red" onClick={() => submitDelete(token.id)}>
-                    {t("common.delete")}
-                  </Button>
-                </Flex>
-              </Flex>
-            ))}
-          </Stack>
-        )}
-
-        {editing && (
-          <Stack gap="xs" mt="md" p="md" style={{ border: "1px solid var(--mantine-color-gray-3)", borderRadius: 8 }}>
-            <Text fw={600}>{t("tokenManager.editToken")}</Text>
-            <TextInput value={editName} onChange={(e) => setEditName(e.currentTarget.value)} placeholder={t("tokenManager.fields.name")} />
-            <PasswordInput
-              value={editToken}
-              onChange={(e) => setEditToken(e.currentTarget.value)}
-              placeholder={t("tokenManager.fields.newTokenPlaceholder", { hint: editing.tokenHint })}
-            />
-            <Flex justify="flex-end" gap={2}>
-              <Button variant="subtle" onClick={() => setEditingId(null)}>
-                {t("common.cancel")}
-              </Button>
-              <Button onClick={submitEdit} disabled={!editName.trim() && !editToken.trim()}>
-                {t("common.save")}
-              </Button>
-            </Flex>
-          </Stack>
-        )}
-      </Stack>
-    </Dialog>
-  );
+	const [isOpen, setOpen, runtimeByKey] = useUnit([
+		llmProviderModel.$isTokenManagerOpen,
+		llmProviderModel.tokenManagerOpened,
+		llmProviderModel.$runtimeByScopeKey,
+	]);
+
+	const activeTokenId = useMemo(() => {
+		const runtime = runtimeByKey[`${scope}:${scopeId}`];
+		return runtime?.activeTokenId ?? null;
+	}, [runtimeByKey, scope, scopeId]);
+
+	return (
+		<LlmTokenManagerDialog
+			open={isOpen}
+			onOpenChange={setOpen}
+			providerId={providerId}
+			activeTokenId={activeTokenId}
+			onTokenSelected={(tokenId) => llmProviderModel.tokenSelected({ scope, scopeId, tokenId })}
+		/>
+	);
 };
-
diff --git a/web/src/features/sidebars/operation-profiles/form/guard-kind-form.ts b/web/src/features/sidebars/operation-profiles/form/guard-kind-form.ts
index baee638d..cc7a531d 100644
--- a/web/src/features/sidebars/operation-profiles/form/guard-kind-form.ts
+++ b/web/src/features/sidebars/operation-profiles/form/guard-kind-form.ts
@@ -4,25 +4,25 @@ import {
 	type GuardOutputContract,
 	type GuardOutputDefinition,
 	type GuardOperationInProfile,
-	type LlmOperationParams,
 	type LlmOperationRetryOn,
-	type LlmOperationSamplers,
 	type OperationArtifactConfig,
 } from '@shared/types/operation-profiles';
 
-import { normalizeRetryOn, pickNumericSamplers } from './operation-llm-form-utils';
+import {
+	normalizeRetryOn,
+	pickNumericSamplers,
+	type OperationLlmRuntimeFields,
+	type OperationSamplerFields,
+} from './operation-llm-form-utils';
 
-export type FormGuardKindParams = {
+export type FormGuardKindParams = OperationLlmRuntimeFields &
+	OperationSamplerFields & {
 	engine: 'liquid' | 'aux_llm';
 	outputContract: GuardOutputContract;
 	template: string;
-	providerId: LlmOperationParams['providerId'];
-	credentialRef: string;
-	model: string;
 	system: string;
 	prompt: string;
 	strictVariables: boolean;
-	samplers: LlmOperationSamplers;
 	timeoutMs: number;
 	retry: {
 		maxAttempts: number;
@@ -78,9 +78,12 @@ export function makeDefaultGuardKindParams(
 		providerId: 'openrouter',
 		credentialRef: '',
 		model: '',
+		llmPresetId: '',
 		system: '',
 		prompt: '',
 		strictVariables: false,
+		samplersEnabled: false,
+		samplerPresetId: '',
 		samplers: {},
 		timeoutMs: 60000,
 		retry: {
@@ -112,9 +115,12 @@ export function normalizeGuardKindParams(op: GuardOperationInProfile): FormGuard
 		providerId: raw.providerId === 'openai_compatible' ? 'openai_compatible' : 'openrouter',
 		credentialRef: typeof raw.credentialRef === 'string' ? raw.credentialRef : '',
 		model: typeof raw.model === 'string' ? raw.model : '',
+		llmPresetId: '',
 		system: typeof raw.system === 'string' ? raw.system : '',
 		prompt: typeof raw.prompt === 'string' ? raw.prompt : '',
 		strictVariables: raw.strictVariables === true,
+		samplersEnabled: Object.keys(pickNumericSamplers(raw.samplers)).length > 0,
+		samplerPresetId: '',
 		samplers: pickNumericSamplers(raw.samplers),
 		timeoutMs: typeof raw.timeoutMs === 'number' && Number.isFinite(raw.timeoutMs) ? raw.timeoutMs : 60000,
 		retry: {
@@ -136,7 +142,7 @@ export function serializeGuardKindParams(params: FormGuardKindParams, opId: stri
 	const system = params.system.trim();
 	const credentialRef = params.credentialRef.trim();
 	const outputContract = normalizeOutputContract(params.outputContract);
-	const samplers = pickNumericSamplers(params.samplers);
+	const samplers = params.samplersEnabled ? pickNumericSamplers(params.samplers) : {};
 	const timeoutMs = Number.isFinite(params.timeoutMs) ? Math.max(1, Math.floor(params.timeoutMs)) : undefined;
 	const retryMaxAttempts = Number.isFinite(params.retry.maxAttempts) ? Math.max(1, Math.floor(params.retry.maxAttempts)) : 1;
 	const retryBackoffMs = Number.isFinite(params.retry.backoffMs) ? Math.max(0, Math.floor(params.retry.backoffMs)) : 0;
@@ -156,7 +162,7 @@ export function serializeGuardKindParams(params: FormGuardKindParams, opId: stri
 			system: system.length > 0 ? system : undefined,
 			prompt: params.prompt,
 			strictVariables: params.strictVariables ? true : undefined,
-			samplers: Object.keys(samplers).length > 0 ? samplers : undefined,
+			samplers: params.samplersEnabled && Object.keys(samplers).length > 0 ? samplers : undefined,
 			timeoutMs,
 			retry: {
 				maxAttempts: retryMaxAttempts,
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.test.ts b/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.test.ts
new file mode 100644
index 00000000..252f6900
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.test.ts
@@ -0,0 +1,121 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+	applyLlmPresetToOperationRuntime,
+	buildOperationLlmRuntimeSummary,
+	buildLlmPresetPayloadFromOperationRuntime,
+	setOperationSamplersEnabled,
+} from './operation-llm-form-utils';
+
+import type { LlmPresetPayload, LlmProviderDefinition, LlmTokenListItem } from '@shared/types/llm';
+import type { LlmOperationSamplers } from '@shared/types/operation-profiles';
+
+describe('operation llm form utils', () => {
+	it('applies preset runtime values as a copy and remembers preset id', () => {
+		const preset: LlmPresetPayload = {
+			activeProviderId: 'openai_compatible',
+			activeTokenId: 'tok-2',
+			activeModel: 'gpt-test',
+			providerConfigsById: {},
+		};
+
+		expect(
+			applyLlmPresetToOperationRuntime(
+				{
+					providerId: 'openrouter',
+					credentialRef: 'tok-1',
+					model: 'old-model',
+					llmPresetId: '',
+				},
+				{ presetId: 'preset-1', payload: preset },
+			),
+		).toEqual({
+			providerId: 'openai_compatible',
+			credentialRef: 'tok-2',
+			model: 'gpt-test',
+			llmPresetId: 'preset-1',
+		});
+	});
+
+	it('keeps the last preset id after manual runtime edits', () => {
+		expect(
+			applyLlmPresetToOperationRuntime(
+				{
+					providerId: 'openrouter',
+					credentialRef: 'tok-9',
+					model: 'custom-model',
+					llmPresetId: 'preset-1',
+				},
+				null,
+			),
+		).toEqual({
+			providerId: 'openrouter',
+			credentialRef: 'tok-9',
+			model: 'custom-model',
+			llmPresetId: 'preset-1',
+		});
+	});
+
+	it('builds a readable runtime summary', () => {
+		const providers: LlmProviderDefinition[] = [
+			{
+				id: 'openrouter',
+				name: 'OpenRouter',
+				enabled: true,
+				requiresToken: true,
+				supportsModels: true,
+				configFields: [],
+			},
+		];
+		const tokens: LlmTokenListItem[] = [
+			{
+				id: 'tok-1',
+				providerId: 'openrouter',
+				name: 'Main token',
+				tokenHint: 'sk-or-1234',
+			},
+		];
+
+		expect(
+			buildOperationLlmRuntimeSummary({
+				providers,
+				tokens,
+				providerId: 'openrouter',
+				credentialRef: 'tok-1',
+				model: 'anthropic/claude-3.5-sonnet',
+			}),
+		).toBe('OpenRouter / Main token / anthropic/claude-3.5-sonnet');
+	});
+
+	it('builds preset payload from copied runtime values', () => {
+		expect(
+			buildLlmPresetPayloadFromOperationRuntime({
+				providerId: 'openrouter',
+				credentialRef: 'tok-1',
+				model: 'claude-test',
+				llmPresetId: 'preset-1',
+			}),
+		).toEqual({
+			activeProviderId: 'openrouter',
+			activeTokenId: 'tok-1',
+			activeModel: 'claude-test',
+			providerConfigsById: {},
+		});
+	});
+
+	it('disabling sampler overrides clears preset id and values', () => {
+		const samplers: LlmOperationSamplers = { temperature: 0.7, topP: 0.9 };
+
+		expect(
+			setOperationSamplersEnabled({
+				samplersEnabled: true,
+				samplerPresetId: 'sampler-1',
+				samplers,
+			}, false),
+		).toEqual({
+			samplersEnabled: false,
+			samplerPresetId: '',
+			samplers: {},
+		});
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.ts b/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.ts
index f2fec429..5c659cc5 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-llm-form-utils.ts
@@ -1,5 +1,19 @@
+import type { LlmPresetPayload, LlmProviderDefinition, LlmTokenListItem } from '@shared/types/llm';
 import type { LlmOperationRetryOn, LlmOperationSamplers } from '@shared/types/operation-profiles';
 
+export type OperationLlmRuntimeFields = {
+	providerId: 'openrouter' | 'openai_compatible';
+	credentialRef: string;
+	model: string;
+	llmPresetId: string;
+};
+
+export type OperationSamplerFields = {
+	samplersEnabled: boolean;
+	samplerPresetId: string;
+	samplers: LlmOperationSamplers;
+};
+
 export function pickNumericSamplers(raw: unknown): LlmOperationSamplers {
 	if (!raw || typeof raw !== 'object') return {};
 	const r = raw as Record<string, unknown>;
@@ -34,3 +48,57 @@ export function normalizeRetryOn(value: unknown): LlmOperationRetryOn[] {
 	const unique = Array.from(new Set(filtered));
 	return unique.length > 0 ? unique : ['timeout', 'provider_error', 'rate_limit'];
 }
+
+export function applyLlmPresetToOperationRuntime(
+	current: OperationLlmRuntimeFields,
+	preset: { presetId: string; payload: LlmPresetPayload } | null,
+): OperationLlmRuntimeFields {
+	if (!preset) {
+		return current;
+	}
+
+	return {
+		providerId: preset.payload.activeProviderId,
+		credentialRef: preset.payload.activeTokenId ?? '',
+		model: preset.payload.activeModel ?? '',
+		llmPresetId: preset.presetId,
+	};
+}
+
+export function buildLlmPresetPayloadFromOperationRuntime(current: OperationLlmRuntimeFields): LlmPresetPayload {
+	return {
+		activeProviderId: current.providerId,
+		activeTokenId: current.credentialRef.trim() || null,
+		activeModel: current.model.trim() || null,
+		providerConfigsById: {},
+	};
+}
+
+export function buildOperationLlmRuntimeSummary(params: {
+	providers: LlmProviderDefinition[];
+	tokens: LlmTokenListItem[];
+	providerId: OperationLlmRuntimeFields['providerId'];
+	credentialRef: string;
+	model: string;
+}): string {
+	const providerName = params.providers.find((item) => item.id === params.providerId)?.name ?? params.providerId;
+	const tokenName = params.tokens.find((item) => item.id === params.credentialRef)?.name ?? params.credentialRef.trim();
+	const model = params.model.trim();
+
+	return [providerName, tokenName, model].filter((item) => typeof item === 'string' && item.length > 0).join(' / ');
+}
+
+export function setOperationSamplersEnabled(current: OperationSamplerFields, enabled: boolean): OperationSamplerFields {
+	if (enabled) {
+		return {
+			...current,
+			samplersEnabled: true,
+		};
+	}
+
+	return {
+		samplersEnabled: false,
+		samplerPresetId: '',
+		samplers: {},
+	};
+}
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
index f55282ee..60bf7518 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
@@ -155,6 +155,9 @@ describe('operation profile form mapping', () => {
 							providerId: 'openrouter',
 							credentialRef: 'cred-1',
 							model: 'gpt-test',
+							llmPresetId: 'preset-1',
+							samplersEnabled: true,
+							samplerPresetId: 'sampler-1',
 							samplers: { temperature: 0.2 },
 							timeoutMs: 15000,
 							retry: {
@@ -235,4 +238,74 @@ describe('operation profile form mapping', () => {
 			},
 		]);
 	});
+
+	it('does not serialize sampler overrides when they are disabled', () => {
+		const values: OperationProfileFormValues = {
+			name: 'Profile',
+			description: '',
+			enabled: true,
+			executionMode: 'concurrent',
+			operationProfileSessionId: 'session-1',
+			operations: [
+				{
+					opId: 'llm-1',
+					name: 'LLM op',
+					description: '',
+					kind: 'llm',
+					config: {
+						enabled: true,
+						required: false,
+						hooks: ['before_main_llm'],
+						triggers: ['generate'],
+						activation: { everyNTurns: 0, everyNContextTokens: 0 },
+						order: 10,
+						dependsOn: [],
+						runConditions: [],
+						params: {
+							providerId: 'openrouter',
+							credentialRef: 'cred-1',
+							model: 'gpt-test',
+							system: '',
+							prompt: 'Prompt',
+							strictVariables: false,
+							outputMode: 'text',
+							jsonParseMode: 'raw',
+							jsonCustomPattern: '',
+							jsonCustomFlags: '',
+							jsonSchemaText: '',
+							strictSchemaValidation: false,
+							llmPresetId: 'preset-1',
+							samplersEnabled: false,
+							samplerPresetId: 'sampler-1',
+							samplers: { temperature: 0.2 },
+							timeoutMs: 60000,
+							retry: {
+								maxAttempts: 1,
+								backoffMs: 0,
+								retryOn: ['timeout'],
+							},
+							artifact: makeArtifact({ artifactId: 'artifact:llm-1', tag: 'llm_op', format: 'markdown' }),
+						},
+					},
+				},
+			],
+		};
+
+		const result = fromOperationProfileForm(values, { validateJson: true });
+		const llm = result.operations[0];
+
+		expect(llm).toMatchObject({
+			kind: 'llm',
+			config: {
+				params: {
+					params: {
+						providerId: 'openrouter',
+						credentialRef: 'cred-1',
+						model: 'gpt-test',
+					},
+				},
+			},
+		});
+		expect((llm as { config: { params: { params: { samplers?: unknown } } } }).config.params.params.samplers).toBeUndefined();
+	});
 });
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
index 7615cec7..022ae374 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
@@ -2,9 +2,7 @@ import {
 	buildOperationArtifactId,
 	makeDefaultOperationArtifactConfig,
 	normalizeOperationArtifactConfig,
-	type LlmOperationParams,
 	type LlmOperationRetryOn,
-	type LlmOperationSamplers,
 	type OperationArtifactConfig,
 	type OperationInProfile,
 	type OperationKind,
@@ -18,7 +16,12 @@ import {
 	serializeGuardKindParams,
 	type FormGuardKindParams,
 } from './guard-kind-form';
-import { normalizeRetryOn, pickNumericSamplers } from './operation-llm-form-utils';
+import {
+	normalizeRetryOn,
+	pickNumericSamplers,
+	type OperationLlmRuntimeFields,
+	type OperationSamplerFields,
+} from './operation-llm-form-utils';
 
 import type { OperationProfileDto } from '../../../../api/chat-core';
 
@@ -33,10 +36,8 @@ export type FormOtherKindParams = {
 
 export type FormRunCondition = OperationRunCondition;
 
-export type FormLlmKindParams = {
-	providerId: LlmOperationParams['providerId'];
-	credentialRef: string;
-	model: string;
+export type FormLlmKindParams = OperationLlmRuntimeFields &
+	OperationSamplerFields & {
 	system: string;
 	prompt: string;
 	strictVariables: boolean;
@@ -46,8 +47,6 @@ export type FormLlmKindParams = {
 	jsonCustomFlags: string;
 	jsonSchemaText: string;
 	strictSchemaValidation: boolean;
-	samplerPresetId: string;
-	samplers: LlmOperationSamplers;
 	timeoutMs: number;
 	retry: {
 		maxAttempts: number;
@@ -103,6 +102,7 @@ export function makeDefaultLlmKindParams(
 		providerId: 'openrouter',
 		credentialRef: '',
 		model: '',
+		llmPresetId: '',
 		system: '',
 		prompt: '',
 		strictVariables: false,
@@ -112,6 +112,7 @@ export function makeDefaultLlmKindParams(
 		jsonCustomFlags: '',
 		jsonSchemaText: '',
 		strictSchemaValidation: false,
+		samplersEnabled: false,
 		samplerPresetId: '',
 		samplers: {},
 		timeoutMs: 60000,
@@ -232,6 +233,7 @@ function normalizeLlmKindParams(op: Extract<OperationInProfile, { kind: 'llm' }>
 		providerId,
 		credentialRef: typeof llmParamsRaw.credentialRef === 'string' ? llmParamsRaw.credentialRef : '',
 		model: typeof llmParamsRaw.model === 'string' ? llmParamsRaw.model : '',
+		llmPresetId: '',
 		system: typeof llmParamsRaw.system === 'string' ? llmParamsRaw.system : '',
 		prompt: typeof llmParamsRaw.prompt === 'string' ? llmParamsRaw.prompt : '',
 		strictVariables: llmParamsRaw.strictVariables === true,
@@ -242,6 +244,10 @@ function normalizeLlmKindParams(op: Extract<OperationInProfile, { kind: 'llm' }>
 		jsonSchemaText:
 			typeof llmParamsRaw.jsonSchema === 'undefined' ? '' : JSON.stringify(llmParamsRaw.jsonSchema, null, 2),
 		strictSchemaValidation: llmParamsRaw.strictSchemaValidation === true,
+		samplersEnabled:
+			typeof llmParamsRaw.samplerPresetId === 'string' && llmParamsRaw.samplerPresetId.length > 0
+				? true
+				: Object.keys(pickNumericSamplers(llmParamsRaw.samplers)).length > 0,
 		samplerPresetId: typeof llmParamsRaw.samplerPresetId === 'string' ? llmParamsRaw.samplerPresetId : '',
 		samplers: pickNumericSamplers(llmParamsRaw.samplers),
 		timeoutMs:
@@ -385,7 +391,7 @@ export function fromOperationProfileForm(
 				const retryMaxAttempts = Number.isFinite(params.retry.maxAttempts) ? Math.max(1, Math.floor(params.retry.maxAttempts)) : 1;
 				const retryBackoffMs = Number.isFinite(params.retry.backoffMs) ? Math.max(0, Math.floor(params.retry.backoffMs)) : 0;
 				const retryOn = normalizeRetryOn(params.retry.retryOn);
-				const samplers = pickNumericSamplers(params.samplers);
+				const samplers = params.samplersEnabled ? pickNumericSamplers(params.samplers) : {};
 				const hasSamplers = Object.keys(samplers).length > 0;
 				let parsedJsonSchema: unknown = undefined;
 				if (jsonSchemaText.length > 0) {
@@ -431,8 +437,9 @@ export function fromOperationProfileForm(
 										: undefined,
 								jsonSchema: typeof parsedJsonSchema === 'undefined' ? undefined : parsedJsonSchema,
 								strictSchemaValidation: params.strictSchemaValidation ? true : undefined,
-								samplerPresetId: samplerPresetId.length > 0 ? samplerPresetId : undefined,
-								samplers: hasSamplers ? samplers : undefined,
+								samplerPresetId:
+									params.samplersEnabled && samplerPresetId.length > 0 ? samplerPresetId : undefined,
+								samplers: params.samplersEnabled && hasSamplers ? samplers : undefined,
 								timeoutMs,
 								retry: {
 									maxAttempts: retryMaxAttempts,
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.test.ts
index 2af5f552..f55cf80e 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.test.ts
+++ b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node-model.test.ts
@@ -37,8 +37,11 @@ function makeOperation(kind: FormOperation['kind']): FormOperation {
 							providerId: 'openrouter',
 							credentialRef: '',
 							model: '',
+							llmPresetId: '',
 							system: '',
 							prompt: '',
+							samplersEnabled: false,
+							samplerPresetId: '',
 							samplers: {},
 							timeoutMs: 60000,
 							retry: {
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts
index 3155874f..f30f4743 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts
+++ b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts
@@ -33,6 +33,9 @@ function makeGuardOperation(): FormOperation {
 				template: '{"isBattle": true, "isNight": false}',
 				strictVariables: false,
 				prompt: '',
+				llmPresetId: '',
+				samplersEnabled: false,
+				samplerPresetId: '',
 				system: '',
 				providerId: 'openrouter',
 				credentialRef: '',
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/guard-kind-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/guard-kind-section.tsx
index b0880d05..c35c84ea 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/guard-kind-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/guard-kind-section.tsx
@@ -7,6 +7,8 @@ import { FormCheckbox, FormInput, FormMultiSelect, FormNumberInput, FormSelect,
 
 import { makeDefaultGuardOutputDefinition } from '../../../../form/guard-kind-form';
 
+import { OperationLlmConfigControls } from './shared/operation-llm-config-controls';
+
 import type { OperationProfileFormValues } from '../../../../form/operation-profile-form-mapping';
 
 type Props = {
@@ -54,15 +56,13 @@ export const GuardKindSection: React.FC<Props> = ({ index }) => {
 			<Stack gap="xs">
 				<Group justify="space-between" align="center">
 					<Text fw={600}>{t('operationProfiles.kindSection.guard.outputContract')}</Text>
-						<Button
-							size="xs"
-							variant="light"
-							onClick={() =>
-								outputContractArray.append(makeDefaultGuardOutputDefinition(outputContractArray.fields.length))
-							}
-						>
-							{t('common.add')}
-						</Button>
+					<Button
+						size="xs"
+						variant="light"
+						onClick={() => outputContractArray.append(makeDefaultGuardOutputDefinition(outputContractArray.fields.length))}
+					>
+						{t('common.add')}
+					</Button>
 				</Group>
 				<Text size="xs" c="dimmed">
 					{t('operationProfiles.kindSection.guard.outputContractInfo')}
@@ -135,24 +135,9 @@ export const GuardKindSection: React.FC<Props> = ({ index }) => {
 						liquidDocsContext="operation_llm"
 						textareaProps={{ minRows: 8, maxRows: 20, autosize: false }}
 					/>
-					<Group grow wrap="wrap">
-						<FormSelect
-							name={`operations.${index}.config.params.providerId`}
-							label={t('operationProfiles.kindSection.guard.providerId')}
-							selectProps={{
-								options: [
-									{ value: 'openrouter', label: 'openrouter' },
-									{ value: 'openai_compatible', label: 'openai_compatible' },
-								],
-								comboboxProps: { withinPortal: false },
-							}}
-						/>
-						<FormInput
-							name={`operations.${index}.config.params.credentialRef`}
-							label={t('operationProfiles.kindSection.guard.credentialRef')}
-						/>
-					</Group>
-					<FormInput name={`operations.${index}.config.params.model`} label={t('operationProfiles.kindSection.guard.model')} />
+
+					<OperationLlmConfigControls index={index} />
+
 					<FormNumberInput
 						name={`operations.${index}.config.params.timeoutMs`}
 						label={t('operationProfiles.kindSection.guard.timeoutMs')}
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/llm-kind-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/llm-kind-section.tsx
index 5ce0db41..4ef86ec4 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/llm-kind-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/llm-kind-section.tsx
@@ -1,21 +1,12 @@
-import { Accordion, Button, Divider, Select, Stack, Text } from '@mantine/core';
-import { useUnit } from 'effector-react';
-import React, { useEffect, useMemo, useState } from 'react';
+import { Button, Divider, Stack, Text } from '@mantine/core';
+import React, { useState } from 'react';
 import { useFormContext, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
-import { getLlmSettingsFields } from '@model/llm-settings';
-import { llmProviderModel } from '@model/provider';
-import { samplersModel } from '@model/samplers';
 import { Dialog } from '@ui/dialog';
 import { FormCheckbox, FormInput, FormMultiSelect, FormNumberInput, FormSelect, FormTextarea } from '@ui/form-components';
 
-import { LlmRuntimeSelectorFields } from '../../../../../../llm-provider/runtime-selector-fields';
-import { SamplerSettingsGrid } from '../../../../../../llm-provider/sampler-settings-grid';
-
-import type { LlmProviderId } from '@shared/types/llm';
-import type { LlmOperationSamplers } from '@shared/types/operation-profiles';
-import type { SamplersItemType } from '@shared/types/samplers';
+import { OperationLlmConfigControls } from './shared/operation-llm-config-controls';
 
 type Props = {
 	index: number;
@@ -31,158 +22,33 @@ const JSON_SCHEMA_EXAMPLE = `{
   "report_id": "string: Unique report identifier",
   "created_at": "string: ISO timestamp",
   "status": "string: Processing status",
-  "confidence?": "number: Optional confidence score from 0 to 1",
-  "summary": {
-    "title": "string: Short title",
-    "items_count": 0
-  },
-  "items": [
-    {
-      "id": "string: Item identifier",
-      "label": "string: Item label",
-      "score?": "number: Optional score"
-    }
-  ]
+  "confidence?": "number: Optional confidence score from 0 to 1"
 }`;
 
-type SelectOption = { value: string; label: string };
-
-function toSafeOption(value: unknown, label: unknown): SelectOption | null {
-	if (typeof value !== 'string' || value.length === 0) return null;
-	return {
-		value,
-		label: typeof label === 'string' && label.length > 0 ? label : value,
-	};
-}
-
-function normalizeProviderId(value: unknown): LlmProviderId {
-	return value === 'openai_compatible' ? 'openai_compatible' : 'openrouter';
-}
-
-function toOperationSamplers(settings: unknown): LlmOperationSamplers {
-	if (!settings || typeof settings !== 'object') return {};
-	const source = settings as Record<string, unknown>;
-	const out: LlmOperationSamplers = {};
-	if (typeof source.temperature === 'number' && Number.isFinite(source.temperature)) out.temperature = source.temperature;
-	if (typeof source.topP === 'number' && Number.isFinite(source.topP)) out.topP = source.topP;
-	if (typeof source.topK === 'number' && Number.isFinite(source.topK)) out.topK = source.topK;
-	if (typeof source.minP === 'number' && Number.isFinite(source.minP)) out.minP = source.minP;
-	if (typeof source.topA === 'number' && Number.isFinite(source.topA)) out.topA = source.topA;
-	if (typeof source.frequencyPenalty === 'number' && Number.isFinite(source.frequencyPenalty)) out.frequencyPenalty = source.frequencyPenalty;
-	if (typeof source.presencePenalty === 'number' && Number.isFinite(source.presencePenalty)) out.presencePenalty = source.presencePenalty;
-	if (typeof source.repetitionPenalty === 'number' && Number.isFinite(source.repetitionPenalty)) out.repetitionPenalty = source.repetitionPenalty;
-	if (typeof source.seed === 'number' && Number.isFinite(source.seed)) out.seed = source.seed;
-	if (typeof source.maxTokens === 'number' && Number.isFinite(source.maxTokens)) out.maxTokens = source.maxTokens;
-	if (source.reasoning && typeof source.reasoning === 'object') {
-		const reasoningSource = source.reasoning as Record<string, unknown>;
-		const reasoning: NonNullable<LlmOperationSamplers['reasoning']> = {};
-		if (typeof reasoningSource.enabled === 'boolean') reasoning.enabled = reasoningSource.enabled;
-		if (
-			typeof reasoningSource.effort === 'string' &&
-			(reasoningSource.effort === 'low' || reasoningSource.effort === 'medium' || reasoningSource.effort === 'high')
-		) {
-			reasoning.effort = reasoningSource.effort;
-		}
-		if (typeof reasoningSource.maxTokens === 'number' && Number.isFinite(reasoningSource.maxTokens)) {
-			reasoning.maxTokens = reasoningSource.maxTokens;
-		}
-		if (typeof reasoningSource.exclude === 'boolean') reasoning.exclude = reasoningSource.exclude;
-		if (Object.keys(reasoning).length > 0) out.reasoning = reasoning;
-	}
-	return out;
-}
-
 export const LlmKindSection: React.FC<Props> = ({ index }) => {
 	const { t } = useTranslation();
-	const { control, setValue, getValues } = useFormContext();
+	const { control } = useFormContext();
 	const [isSchemaHelpOpen, setSchemaHelpOpen] = useState(false);
-	const [
-		providers,
-		tokensByProvider,
-		modelsByProviderToken,
-		loadProvidersFx,
-		loadTokensFx,
-		loadModelsFx,
-		samplerPresets,
-	] = useUnit([
-		llmProviderModel.$providers,
-		llmProviderModel.$tokensByProviderId,
-		llmProviderModel.$modelsByProviderTokenKey,
-		llmProviderModel.loadProvidersFx,
-		llmProviderModel.loadTokensFx,
-		llmProviderModel.loadModelsFx,
-		samplersModel.$items,
-	]);
-
-	const llmSettingsFields = getLlmSettingsFields(t);
-	const providerPath = `operations.${index}.config.params.providerId` as const;
-	const tokenPath = `operations.${index}.config.params.credentialRef` as const;
-	const modelPath = `operations.${index}.config.params.model` as const;
-	const samplerPresetPath = `operations.${index}.config.params.samplerPresetId` as const;
-	const samplersPath = `operations.${index}.config.params.samplers` as const;
-	const retryPath = `operations.${index}.config.params.retry.retryOn` as const;
 	const outputModePath = `operations.${index}.config.params.outputMode` as const;
 	const jsonParseModePath = `operations.${index}.config.params.jsonParseMode` as const;
 	const jsonCustomPatternPath = `operations.${index}.config.params.jsonCustomPattern` as const;
 	const jsonCustomFlagsPath = `operations.${index}.config.params.jsonCustomFlags` as const;
 	const strictSchemaValidationPath = `operations.${index}.config.params.strictSchemaValidation` as const;
 	const jsonSchemaTextPath = `operations.${index}.config.params.jsonSchemaText` as const;
+	const retryPath = `operations.${index}.config.params.retry.retryOn` as const;
 
-	const rawProviderId = useWatch({ control, name: providerPath }) as unknown;
-	const activeProviderId = normalizeProviderId(rawProviderId);
-	const credentialRef = useWatch({ control, name: tokenPath }) as unknown;
-	const activeTokenId = typeof credentialRef === 'string' && credentialRef.length > 0 ? credentialRef : null;
-	const rawModel = useWatch({ control, name: modelPath }) as unknown;
-	const activeModel = typeof rawModel === 'string' && rawModel.length > 0 ? rawModel : null;
-	const rawSamplerPresetId = useWatch({ control, name: samplerPresetPath }) as unknown;
-	const samplerPresetId = typeof rawSamplerPresetId === 'string' ? rawSamplerPresetId : '';
 	const rawOutputMode = useWatch({ control, name: outputModePath }) as unknown;
 	const outputMode = rawOutputMode === 'json' ? 'json' : 'text';
 	const rawJsonParseMode = useWatch({ control, name: jsonParseModePath }) as unknown;
 	const jsonParseMode =
 		rawJsonParseMode === 'markdown_code_block' || rawJsonParseMode === 'custom_regex' ? rawJsonParseMode : 'raw';
 
-	const tokens = tokensByProvider[activeProviderId] ?? [];
-	const modelsKey = `${activeProviderId}:${activeTokenId ?? 'none'}`;
-	const models = modelsByProviderToken[modelsKey] ?? [];
-
-	const samplerOptions = useMemo(
-		() =>
-			(samplerPresets as SamplersItemType[])
-				.map((item) => toSafeOption(item?.id, item?.name))
-				.filter((item): item is SelectOption => item !== null),
-		[samplerPresets],
-	);
-
-	useEffect(() => {
-		void loadProvidersFx();
-	}, [loadProvidersFx]);
-
-	useEffect(() => {
-		void loadTokensFx(activeProviderId);
-	}, [activeProviderId, loadTokensFx]);
-
-	const loadModels = async () => {
-		if (!activeTokenId) return;
-		await loadModelsFx({
-			providerId: activeProviderId,
-			scope: 'global',
-			scopeId: 'global',
-			tokenId: activeTokenId,
-		});
-	};
-
-	const retryOnOptions: SelectOption[] = RETRY_ON_OPTIONS.map((item) => toSafeOption(item.value, t(item.labelKey))).filter(
-		(item): item is SelectOption => item !== null,
-	);
-
+	const retryOnOptions = RETRY_ON_OPTIONS.map((item) => ({ value: item.value, label: t(item.labelKey) }));
 	const parseModeInfoContent = (
 		<Stack gap={4}>
 			<Text size="xs">{t('operationProfiles.kindSection.llm.jsonParseModeInfo')}</Text>
 			<Text size="xs">`raw`: {t('operationProfiles.kindSection.llm.jsonParseModeHintRaw')}</Text>
-			<Text size="xs">
-				`markdown_code_block`: {t('operationProfiles.kindSection.llm.jsonParseModeHintMarkdownCodeBlock')}
-			</Text>
+			<Text size="xs">`markdown_code_block`: {t('operationProfiles.kindSection.llm.jsonParseModeHintMarkdownCodeBlock')}</Text>
 			<Text size="xs">`custom_regex`: {t('operationProfiles.kindSection.llm.jsonParseModeHintCustomRegex')}</Text>
 		</Stack>
 	);
@@ -218,83 +84,7 @@ export const LlmKindSection: React.FC<Props> = ({ index }) => {
 
 			<Divider />
 
-			<Accordion multiple defaultValue={['provider', 'samplers']} variant="contained">
-				<Accordion.Item value="provider">
-					<Accordion.Control>{t('operationProfiles.kindSection.llm.blocks.provider')}</Accordion.Control>
-					<Accordion.Panel>
-						<Stack gap="xs">
-							<LlmRuntimeSelectorFields
-								providers={providers}
-								activeProviderId={activeProviderId}
-								tokens={tokens}
-								activeTokenId={activeTokenId}
-								models={models}
-								activeModel={activeModel}
-								onProviderSelect={(providerId) => {
-									const currentProviderId = normalizeProviderId(getValues(providerPath));
-									if (providerId === currentProviderId) return;
-									setValue(providerPath, providerId, { shouldDirty: true });
-									setValue(tokenPath, '', { shouldDirty: true });
-									setValue(modelPath, '', { shouldDirty: true });
-								}}
-								onTokenSelect={(tokenId) => {
-									const nextTokenId = tokenId ?? '';
-									const currentTokenIdRaw = getValues(tokenPath);
-									const currentTokenId = typeof currentTokenIdRaw === 'string' ? currentTokenIdRaw : '';
-									if (nextTokenId === currentTokenId) return;
-
-									setValue(tokenPath, nextTokenId, { shouldDirty: true });
-
-									const currentModelRaw = getValues(modelPath);
-									const currentModel = typeof currentModelRaw === 'string' ? currentModelRaw : '';
-									if (currentModel.length > 0) {
-										setValue(modelPath, '', { shouldDirty: true });
-									}
-								}}
-								onModelSelect={(model) => {
-									const nextModel = model ?? '';
-									const currentModelRaw = getValues(modelPath);
-									const currentModel = typeof currentModelRaw === 'string' ? currentModelRaw : '';
-									if (nextModel === currentModel) return;
-									setValue(modelPath, nextModel, { shouldDirty: true });
-								}}
-								onLoadModels={loadModels}
-								allowTokenManager={false}
-							/>
-						</Stack>
-					</Accordion.Panel>
-				</Accordion.Item>
-
-				<Accordion.Item value="samplers">
-					<Accordion.Control>{t('operationProfiles.kindSection.llm.blocks.samplers')}</Accordion.Control>
-					<Accordion.Panel>
-						<Stack gap="xs">
-							<Select
-								label={t('operationProfiles.kindSection.llm.samplerPreset')}
-								description={t('operationProfiles.kindSection.llm.samplerPresetInfo')}
-								data={samplerOptions}
-								value={samplerPresetId}
-								onChange={(next) => {
-									const presetId = next ?? '';
-									if (presetId === samplerPresetId) return;
-									setValue(samplerPresetPath, presetId, { shouldDirty: true });
-									const preset = (samplerPresets as SamplersItemType[]).find((item) => item.id === presetId);
-									if (!preset) return;
-									setValue(samplersPath, toOperationSamplers(preset.settings), { shouldDirty: true });
-								}}
-								clearable
-								searchable
-								comboboxProps={{ withinPortal: false }}
-							/>
-							<SamplerSettingsGrid
-								control={control}
-								fields={llmSettingsFields}
-								fieldPrefix={`operations.${index}.config.params.samplers`}
-							/>
-						</Stack>
-					</Accordion.Panel>
-				</Accordion.Item>
-			</Accordion>
+			<OperationLlmConfigControls index={index} />
 
 			<Divider />
 
@@ -382,12 +172,7 @@ export const LlmKindSection: React.FC<Props> = ({ index }) => {
 							name={jsonSchemaTextPath}
 							label={t('operationProfiles.kindSection.llm.jsonSchema')}
 							infoTip={t('operationProfiles.kindSection.llm.jsonSchemaInfo')}
-							textareaProps={{
-								minRows: 10,
-								maxRows: 24,
-								autosize: false,
-								placeholder: JSON_SCHEMA_EXAMPLE,
-							}}
+							textareaProps={{ minRows: 10, maxRows: 24, autosize: false, placeholder: JSON_SCHEMA_EXAMPLE }}
 						/>
 						<Button variant="light" size="xs" onClick={() => setSchemaHelpOpen(true)}>
 							{t('operationProfiles.kindSection.llm.schemaHelp.open')}
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-config-controls.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-config-controls.tsx
new file mode 100644
index 00000000..e4d8380f
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-config-controls.tsx
@@ -0,0 +1,224 @@
+import { Button, Checkbox, Group, Select, Stack, Text } from '@mantine/core';
+import { useUnit } from 'effector-react';
+import React, { useEffect, useMemo, useState } from 'react';
+import { useFormContext, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+
+import { llmProviderModel } from '@model/provider';
+import { samplersModel } from '@model/samplers';
+
+import {
+	applyLlmPresetToOperationRuntime,
+	buildOperationLlmRuntimeSummary,
+	setOperationSamplersEnabled,
+	type OperationLlmRuntimeFields,
+	type OperationSamplerFields,
+} from '../../../../../form/operation-llm-form-utils';
+
+import { OperationLlmRuntimeDialog } from './operation-llm-runtime-dialog';
+import { OperationSamplerDialog } from './operation-sampler-dialog';
+
+import type { OperationProfileFormValues } from '../../../../../form/operation-profile-form-mapping';
+import type { SamplersItemType } from '@shared/types/samplers';
+
+type Props = {
+	index: number;
+};
+
+export const OperationLlmConfigControls: React.FC<Props> = ({ index }) => {
+	const { t } = useTranslation();
+	const { control, setValue } = useFormContext<OperationProfileFormValues>();
+	const [isRuntimeDialogOpen, setRuntimeDialogOpen] = useState(false);
+	const [isSamplerDialogOpen, setSamplerDialogOpen] = useState(false);
+	const [
+		providers,
+		tokensByProviderId,
+		modelsByProviderTokenKey,
+		presets,
+		samplerPresets,
+		loadProvidersFx,
+		loadTokensFx,
+		loadModelsFx,
+		loadLlmPresetsFx,
+		createLlmPresetFx,
+		updateLlmPresetFx,
+		deleteLlmPresetFx,
+	] = useUnit([
+		llmProviderModel.$providers,
+		llmProviderModel.$tokensByProviderId,
+		llmProviderModel.$modelsByProviderTokenKey,
+		llmProviderModel.$llmPresets,
+		samplersModel.$items,
+		llmProviderModel.loadProvidersFx,
+		llmProviderModel.loadTokensFx,
+		llmProviderModel.loadModelsFx,
+		llmProviderModel.loadLlmPresetsFx,
+		llmProviderModel.createLlmPresetFx,
+		llmProviderModel.updateLlmPresetFx,
+		llmProviderModel.deleteLlmPresetFx,
+	]);
+
+	const fieldPrefix = `operations.${index}.config.params` as const;
+	const providerId = (useWatch({ control, name: `${fieldPrefix}.providerId` }) as OperationLlmRuntimeFields['providerId']) ?? 'openrouter';
+	const credentialRef = (useWatch({ control, name: `${fieldPrefix}.credentialRef` }) as string) ?? '';
+	const model = (useWatch({ control, name: `${fieldPrefix}.model` }) as string) ?? '';
+	const llmPresetId = (useWatch({ control, name: `${fieldPrefix}.llmPresetId` }) as string) ?? '';
+	const samplersEnabled = Boolean(useWatch({ control, name: `${fieldPrefix}.samplersEnabled` }) as boolean | undefined);
+	const samplerPresetId = (useWatch({ control, name: `${fieldPrefix}.samplerPresetId` }) as string) ?? '';
+	const samplers = (useWatch({ control, name: `${fieldPrefix}.samplers` }) as OperationSamplerFields['samplers']) ?? {};
+
+	const runtime: OperationLlmRuntimeFields = {
+		providerId,
+		credentialRef,
+		model,
+		llmPresetId,
+	};
+	const samplerFields: OperationSamplerFields = {
+		samplersEnabled,
+		samplerPresetId,
+		samplers,
+	};
+
+	const tokens = tokensByProviderId[providerId] ?? [];
+	const models = modelsByProviderTokenKey[`${providerId}:${credentialRef || 'none'}`] ?? [];
+	const runtimeSummary = buildOperationLlmRuntimeSummary({
+		providers,
+		tokens,
+		providerId,
+		credentialRef,
+		model,
+	});
+	const presetOptions = useMemo(
+		() => presets.map((item) => ({ value: item.presetId, label: item.name })),
+		[presets],
+	);
+
+	useEffect(() => {
+		void loadProvidersFx();
+		void loadLlmPresetsFx();
+	}, [loadLlmPresetsFx, loadProvidersFx]);
+
+	useEffect(() => {
+		void loadTokensFx(providerId);
+	}, [loadTokensFx, providerId]);
+
+	const patchRuntime = (patch: Partial<OperationLlmRuntimeFields>) => {
+		if (typeof patch.providerId !== 'undefined') {
+			setValue(`${fieldPrefix}.providerId`, patch.providerId, { shouldDirty: true });
+		}
+		if (typeof patch.credentialRef !== 'undefined') {
+			setValue(`${fieldPrefix}.credentialRef`, patch.credentialRef, { shouldDirty: true });
+		}
+		if (typeof patch.model !== 'undefined') {
+			setValue(`${fieldPrefix}.model`, patch.model, { shouldDirty: true });
+		}
+		if (typeof patch.llmPresetId !== 'undefined') {
+			setValue(`${fieldPrefix}.llmPresetId`, patch.llmPresetId, { shouldDirty: true });
+		}
+	};
+
+	const patchSamplerFields = (patch: Partial<OperationSamplerFields>) => {
+		if (typeof patch.samplersEnabled !== 'undefined') {
+			setValue(`${fieldPrefix}.samplersEnabled`, patch.samplersEnabled, { shouldDirty: true });
+		}
+		if (typeof patch.samplerPresetId !== 'undefined') {
+			setValue(`${fieldPrefix}.samplerPresetId`, patch.samplerPresetId, { shouldDirty: true });
+		}
+		if (typeof patch.samplers !== 'undefined') {
+			setValue(`${fieldPrefix}.samplers`, patch.samplers, { shouldDirty: true });
+		}
+	};
+
+	return (
+		<>
+			<Stack gap="xs">
+				<Select
+					label={t('operationProfiles.llmRuntime.preset')}
+					description={t('operationProfiles.llmRuntime.presetInfo')}
+					data={presetOptions}
+					value={llmPresetId || null}
+					onChange={(nextValue) => {
+						if (!nextValue) {
+							patchRuntime({ llmPresetId: '' });
+							return;
+						}
+						const preset = presets.find((item) => item.presetId === nextValue);
+						if (!preset) return;
+						patchRuntime(applyLlmPresetToOperationRuntime(runtime, { presetId: preset.presetId, payload: preset.payload }));
+					}}
+					clearable
+					searchable
+					comboboxProps={{ withinPortal: false }}
+				/>
+
+				<Group align="center" justify="space-between" wrap="wrap">
+					<Stack gap={2}>
+						<Text size="sm" fw={600}>
+							{t('operationProfiles.llmRuntime.summaryLabel')}
+						</Text>
+						<Text size="sm" c="dimmed">
+							{runtimeSummary || t('operationProfiles.llmRuntime.notConfigured')}
+						</Text>
+					</Stack>
+					<Button variant="light" onClick={() => setRuntimeDialogOpen(true)}>
+						{t('operationProfiles.llmRuntime.configure')}
+					</Button>
+				</Group>
+
+				<Group align="center" justify="space-between" wrap="wrap">
+					<Checkbox
+						label={t('operationProfiles.samplers.enabled')}
+						checked={samplersEnabled}
+						onChange={(event) => {
+							patchSamplerFields(setOperationSamplersEnabled(samplerFields, event.currentTarget.checked));
+						}}
+					/>
+					<Button variant="light" onClick={() => setSamplerDialogOpen(true)} disabled={!samplersEnabled}>
+						{t('operationProfiles.samplers.configure')}
+					</Button>
+				</Group>
+			</Stack>
+
+			<OperationLlmRuntimeDialog
+				open={isRuntimeDialogOpen}
+				onOpenChange={setRuntimeDialogOpen}
+				providers={providers}
+				tokens={tokens}
+				models={models}
+				presets={presets}
+				runtime={runtime}
+				onRuntimeChange={patchRuntime}
+				onPresetSelect={(presetId) => {
+					if (!presetId) {
+						patchRuntime({ llmPresetId: '' });
+						return;
+					}
+					const preset = presets.find((item) => item.presetId === presetId);
+					if (!preset) return;
+					patchRuntime(applyLlmPresetToOperationRuntime(runtime, { presetId: preset.presetId, payload: preset.payload }));
+				}}
+				onLoadModels={async () => {
+					await loadModelsFx({
+						providerId,
+						scope: 'global',
+						scopeId: 'global',
+						tokenId: credentialRef || null,
+					});
+				}}
+				onCreatePreset={createLlmPresetFx}
+				onUpdatePreset={updateLlmPresetFx}
+				onDeletePreset={deleteLlmPresetFx}
+			/>
+
+			<OperationSamplerDialog
+				open={isSamplerDialogOpen}
+				onOpenChange={setSamplerDialogOpen}
+				control={control}
+				fieldPrefix={`${fieldPrefix}.samplers`}
+				samplerFields={samplerFields}
+				samplerPresets={samplerPresets as SamplersItemType[]}
+				onSamplerFieldsChange={patchSamplerFields}
+			/>
+		</>
+	);
+};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-preset-manager.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-preset-manager.tsx
new file mode 100644
index 00000000..e270108a
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-preset-manager.tsx
@@ -0,0 +1,151 @@
+import { useTranslation } from 'react-i18next';
+
+import { toaster } from '@ui/toaster';
+
+import { PresetControls } from '../../../../../../settings/preset-controls';
+import { buildLlmPresetPayloadFromOperationRuntime, type OperationLlmRuntimeFields } from '../../../../../form/operation-llm-form-utils';
+
+import type { LlmPresetDto } from '../../../../../../../../api/llm';
+
+type Props = {
+	presets: LlmPresetDto[];
+	selectedPresetId: string;
+	runtime: OperationLlmRuntimeFields;
+	onPresetSelect: (presetId: string | null) => void;
+	onCreatePreset: (params: { name: string; payload: LlmPresetDto['payload'] }) => Promise<LlmPresetDto>;
+	onUpdatePreset: (params: {
+		presetId: string;
+		name?: string;
+		description?: string | null;
+		payload?: LlmPresetDto['payload'];
+	}) => Promise<LlmPresetDto>;
+	onDeletePreset: (presetId: string) => Promise<{ id: string }>;
+};
+
+export const OperationLlmPresetManager: React.FC<Props> = ({
+	presets,
+	selectedPresetId,
+	runtime,
+	onPresetSelect,
+	onCreatePreset,
+	onUpdatePreset,
+	onDeletePreset,
+}) => {
+	const { t } = useTranslation();
+	const activePreset = presets.find((item) => item.presetId === selectedPresetId) ?? null;
+
+	const createPreset = async () => {
+		const fallback = t('provider.presets.defaults.newPresetName');
+		const rawName = window.prompt(t('provider.presets.actions.createPrompt'), fallback);
+		const name = rawName?.trim();
+		if (!name) return;
+
+		try {
+			const created = await onCreatePreset({
+				name,
+				payload: buildLlmPresetPayloadFromOperationRuntime(runtime),
+			});
+			onPresetSelect(created.presetId);
+			toaster.success({ title: t('provider.presets.toasts.created'), description: created.name });
+		} catch (error) {
+			toaster.error({
+				title: t('provider.presets.toasts.failed'),
+				description: error instanceof Error ? error.message : String(error),
+			});
+		}
+	};
+
+	const savePreset = async () => {
+		if (!activePreset) return;
+		try {
+			await onUpdatePreset({
+				presetId: activePreset.presetId,
+				payload: buildLlmPresetPayloadFromOperationRuntime(runtime),
+			});
+			toaster.success({ title: t('provider.presets.toasts.saved'), description: activePreset.name });
+		} catch (error) {
+			toaster.error({
+				title: t('provider.presets.toasts.failed'),
+				description: error instanceof Error ? error.message : String(error),
+			});
+		}
+	};
+
+	const renamePreset = async () => {
+		if (!activePreset) return;
+		const rawName = window.prompt(t('provider.presets.actions.renamePrompt'), activePreset.name);
+		const name = rawName?.trim();
+		if (!name) return;
+
+		try {
+			await onUpdatePreset({ presetId: activePreset.presetId, name });
+			toaster.success({ title: t('provider.presets.toasts.saved'), description: name });
+		} catch (error) {
+			toaster.error({
+				title: t('provider.presets.toasts.failed'),
+				description: error instanceof Error ? error.message : String(error),
+			});
+		}
+	};
+
+	const duplicatePreset = async () => {
+		if (!activePreset) return;
+
+		try {
+			const created = await onCreatePreset({
+				name: `${activePreset.name} copy`,
+				payload: activePreset.payload,
+			});
+			onPresetSelect(created.presetId);
+			toaster.success({ title: t('provider.presets.toasts.created'), description: created.name });
+		} catch (error) {
+			toaster.error({
+				title: t('provider.presets.toasts.failed'),
+				description: error instanceof Error ? error.message : String(error),
+			});
+		}
+	};
+
+	const deletePreset = async () => {
+		if (!activePreset) return;
+		if (!window.confirm(t('provider.presets.confirm.delete'))) return;
+
+		try {
+			await onDeletePreset(activePreset.presetId);
+			onPresetSelect(null);
+			toaster.success({ title: t('provider.presets.toasts.deleted'), description: activePreset.name });
+		} catch (error) {
+			toaster.error({
+				title: t('provider.presets.toasts.failed'),
+				description: error instanceof Error ? error.message : String(error),
+			});
+		}
+	};
+
+	return (
+		<PresetControls
+			layout="stacked"
+			labels={{
+				title: t('provider.presets.title'),
+				active: t('provider.presets.active'),
+				create: t('provider.presets.actions.create'),
+				rename: t('provider.presets.actions.rename'),
+				duplicate: t('provider.presets.actions.duplicate'),
+				save: t('provider.presets.actions.save'),
+				delete: t('provider.presets.actions.delete'),
+			}}
+			options={presets.map((item) => ({ value: item.presetId, label: item.name }))}
+			value={selectedPresetId || null}
+			onChange={(value) => onPresetSelect(value)}
+			onCreate={() => void createPreset()}
+			onRename={() => void renamePreset()}
+			onDuplicate={() => void duplicatePreset()}
+			onSave={() => void savePreset()}
+			onDelete={() => void deletePreset()}
+			disableRename={!activePreset}
+			disableDuplicate={!activePreset}
+			disableSave={!activePreset}
+			disableDelete={!activePreset}
+		/>
+	);
+};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-runtime-dialog.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-runtime-dialog.tsx
new file mode 100644
index 00000000..73736041
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-llm-runtime-dialog.tsx
@@ -0,0 +1,136 @@
+import { Button, Stack, Text } from '@mantine/core';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { Dialog } from '@ui/dialog';
+import { toaster } from '@ui/toaster';
+
+import { LlmTokenManagerDialog } from '../../../../../../../llm-provider/llm-token-manager-dialog';
+import { LlmRuntimeSelectorFields } from '../../../../../../../llm-provider/runtime-selector-fields';
+
+import { OperationLlmPresetManager } from './operation-llm-preset-manager';
+
+import type { LlmPresetDto } from '../../../../../../../../api/llm';
+import type { OperationLlmRuntimeFields } from '../../../../../form/operation-llm-form-utils';
+import type { LlmModel, LlmProviderDefinition, LlmProviderId, LlmTokenListItem } from '@shared/types/llm';
+
+type Props = {
+	open: boolean;
+	onOpenChange: (open: boolean) => void;
+	providers: LlmProviderDefinition[];
+	tokens: LlmTokenListItem[];
+	models: LlmModel[];
+	presets: LlmPresetDto[];
+	runtime: OperationLlmRuntimeFields;
+	onRuntimeChange: (patch: Partial<OperationLlmRuntimeFields>) => void;
+	onPresetSelect: (presetId: string | null) => void;
+	onLoadModels: () => Promise<void>;
+	onCreatePreset: (params: { name: string; payload: LlmPresetDto['payload'] }) => Promise<LlmPresetDto>;
+	onUpdatePreset: (params: {
+		presetId: string;
+		name?: string;
+		description?: string | null;
+		payload?: LlmPresetDto['payload'];
+	}) => Promise<LlmPresetDto>;
+	onDeletePreset: (presetId: string) => Promise<{ id: string }>;
+};
+
+export const OperationLlmRuntimeDialog: React.FC<Props> = ({
+	open,
+	onOpenChange,
+	providers,
+	tokens,
+	models,
+	presets,
+	runtime,
+	onRuntimeChange,
+	onPresetSelect,
+	onLoadModels,
+	onCreatePreset,
+	onUpdatePreset,
+	onDeletePreset,
+}) => {
+	const { t } = useTranslation();
+	const [isTokenManagerOpen, setTokenManagerOpen] = useState(false);
+
+	return (
+		<>
+			<Dialog
+				open={open}
+				onOpenChange={onOpenChange}
+				title={t('operationProfiles.llmRuntime.dialogTitle')}
+				size="xl"
+				footer={
+					<Button variant="subtle" onClick={() => onOpenChange(false)}>
+						{t('common.close')}
+					</Button>
+				}
+			>
+				<Stack gap="md">
+					<Text size="sm" c="dimmed">
+						{t('operationProfiles.llmRuntime.dialogDescription')}
+					</Text>
+
+					<OperationLlmPresetManager
+						presets={presets}
+						selectedPresetId={runtime.llmPresetId}
+						runtime={runtime}
+						onPresetSelect={onPresetSelect}
+						onCreatePreset={onCreatePreset}
+						onUpdatePreset={onUpdatePreset}
+						onDeletePreset={onDeletePreset}
+					/>
+
+					<LlmRuntimeSelectorFields
+						providers={providers}
+						activeProviderId={runtime.providerId}
+						tokens={tokens}
+						activeTokenId={runtime.credentialRef || null}
+						models={models}
+						activeModel={runtime.model || null}
+						onProviderSelect={(providerId: LlmProviderId) =>
+							onRuntimeChange({
+								providerId,
+								credentialRef: '',
+								model: '',
+							})
+						}
+						onTokenSelect={(tokenId: string | null) =>
+							onRuntimeChange({
+								credentialRef: tokenId ?? '',
+								model: '',
+							})
+						}
+						onModelSelect={(model: string | null) => onRuntimeChange({ model: model ?? '' })}
+						onLoadModels={async () => {
+							try {
+								await onLoadModels();
+							} catch (error) {
+								toaster.error({
+									title: t('provider.toasts.modelsLoadFailed'),
+									description: error instanceof Error ? error.message : String(error),
+								});
+							}
+						}}
+						allowTokenManager
+						showInlineTokenManager={false}
+						tokenManagerScope="global"
+						tokenManagerScopeId="global"
+						onOpenTokenManager={setTokenManagerOpen}
+					/>
+					<Text size="sm" c="dimmed">
+						{t('operationProfiles.llmRuntime.tokenHelp')}
+					</Text>
+				</Stack>
+			</Dialog>
+
+			<LlmTokenManagerDialog
+				open={isTokenManagerOpen}
+				onOpenChange={setTokenManagerOpen}
+				providerId={runtime.providerId}
+				activeTokenId={runtime.credentialRef || null}
+				onTokenSelected={(tokenId: string | null) => onRuntimeChange({ credentialRef: tokenId ?? '', model: '' })}
+			/>
+		</>
+	);
+};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-sampler-dialog.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-sampler-dialog.tsx
new file mode 100644
index 00000000..83c1607e
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/shared/operation-sampler-dialog.tsx
@@ -0,0 +1,80 @@
+import { Button, Select, Stack, Text } from '@mantine/core';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { getLlmSettingsFields } from '@model/llm-settings';
+import { Dialog } from '@ui/dialog';
+
+import { SamplerSettingsGrid } from '../../../../../../../llm-provider/sampler-settings-grid';
+import { pickNumericSamplers, type OperationSamplerFields } from '../../../../../form/operation-llm-form-utils';
+
+import type { SamplersItemType } from '@shared/types/samplers';
+import type { Control } from 'react-hook-form';
+
+type Props = {
+	open: boolean;
+	onOpenChange: (open: boolean) => void;
+	control: Control<any>;
+	fieldPrefix: string;
+	samplerFields: OperationSamplerFields;
+	samplerPresets: SamplersItemType[];
+	onSamplerFieldsChange: (patch: Partial<OperationSamplerFields>) => void;
+};
+
+export const OperationSamplerDialog: React.FC<Props> = ({
+	open,
+	onOpenChange,
+	control,
+	fieldPrefix,
+	samplerFields,
+	samplerPresets,
+	onSamplerFieldsChange,
+}) => {
+	const { t } = useTranslation();
+	const llmSettingsFields = getLlmSettingsFields(t);
+	const options = useMemo(
+		() =>
+			samplerPresets
+				.filter((item) => typeof item.id === 'string' && typeof item.name === 'string')
+				.map((item) => ({ value: item.id, label: item.name })),
+		[samplerPresets],
+	);
+
+	return (
+		<Dialog
+			open={open}
+			onOpenChange={onOpenChange}
+			title={t('operationProfiles.samplers.dialogTitle')}
+			size="xl"
+			footer={
+				<Button variant="subtle" onClick={() => onOpenChange(false)}>
+					{t('common.close')}
+				</Button>
+			}
+		>
+			<Stack gap="md">
+				<Text size="sm" c="dimmed">
+					{t('operationProfiles.samplers.dialogDescription')}
+				</Text>
+				<Select
+					label={t('operationProfiles.kindSection.llm.samplerPreset')}
+					description={t('operationProfiles.kindSection.llm.samplerPresetInfo')}
+					data={options}
+					value={samplerFields.samplerPresetId || null}
+					onChange={(nextValue) => {
+						const presetId = nextValue ?? '';
+						const preset = samplerPresets.find((item) => item.id === presetId);
+						onSamplerFieldsChange({
+							samplerPresetId: presetId,
+							samplers: preset ? pickNumericSamplers(preset.settings) : samplerFields.samplers,
+						});
+					}}
+					clearable
+					searchable
+					comboboxProps={{ withinPortal: false }}
+				/>
+				<SamplerSettingsGrid control={control} fields={llmSettingsFields} fieldPrefix={fieldPrefix} />
+			</Stack>
+		</Dialog>
+	);
+};
diff --git a/web/src/i18n/resources/en/operationProfiles.ts b/web/src/i18n/resources/en/operationProfiles.ts
index 65116cea..b38117fa 100644
--- a/web/src/i18n/resources/en/operationProfiles.ts
+++ b/web/src/i18n/resources/en/operationProfiles.ts
@@ -80,6 +80,22 @@ const enOperationProfiles = {
 				title: 'Operation',
 				unsaved: 'Unsaved',
 			},
+			llmRuntime: {
+				preset: 'LLM preset',
+				presetInfo: 'Preset selection copies provider, token, and model into this operation.',
+				summaryLabel: 'Current configuration',
+				notConfigured: 'Provider, token, or model is not configured yet.',
+				configure: 'Configure model',
+				dialogTitle: 'Operation LLM setup',
+				dialogDescription: 'Choose a preset or manually configure provider, token, and model for this operation.',
+				tokenHelp: 'The token is selected from stored provider tokens and will be used for this operation request.',
+			},
+			samplers: {
+				enabled: 'Enable sampler overrides',
+				configure: 'Configure samplers',
+				dialogTitle: 'Sampler setup',
+				dialogDescription: 'Selecting a preset copies values into overrides. Changes affect only this operation.',
+			},
 			fields: {
 				operationName: 'Operation name',
 				kind: 'Kind',
@@ -303,7 +319,7 @@ const enOperationProfiles = {
 					prompt: 'Prompt',
 					promptInfo: 'Prompt rendered against operation context and expected to produce JSON by contract.',
 					providerId: 'Provider',
-					credentialRef: 'Credential',
+					credentialRef: 'Token',
 					model: 'Model',
 					timeoutMs: 'Timeout (ms)',
 					retryMaxAttempts: 'Retry max attempts',
diff --git a/web/src/i18n/resources/ru/operationProfiles.ts b/web/src/i18n/resources/ru/operationProfiles.ts
index f9d0ed8f..57c76bc3 100644
--- a/web/src/i18n/resources/ru/operationProfiles.ts
+++ b/web/src/i18n/resources/ru/operationProfiles.ts
@@ -80,6 +80,22 @@ const ruOperationProfiles = {
 				title: 'Операция',
 				unsaved: 'Не сохранено',
 			},
+			llmRuntime: {
+				preset: 'LLM пресет',
+				presetInfo: 'Пресет копирует провайдер, токен и модель в эту операцию.',
+				summaryLabel: 'Текущая конфигурация',
+				notConfigured: 'Провайдер, токен или модель еще не настроены.',
+				configure: 'Настроить модель',
+				dialogTitle: 'Настройка LLM для операции',
+				dialogDescription: 'Выберите пресет или вручную настройте провайдер, токен и модель для этой операции.',
+				tokenHelp: 'Токен выбирается из сохраненных токенов провайдера и будет использован для этого запроса операции.',
+			},
+			samplers: {
+				enabled: 'Включить overrides сэмплеров',
+				configure: 'Настроить сэмплеры',
+				dialogTitle: 'Настройка сэмплеров',
+				dialogDescription: 'Пресет копирует значения в overrides. Изменения применяются только к этой операции.',
+			},
 			fields: {
 				operationName: 'Имя операции',
 				kind: 'Тип',
@@ -304,7 +320,7 @@ const ruOperationProfiles = {
 					prompt: 'Промпт',
 					promptInfo: 'Промпт рендерится в контексте операции и должен вернуть JSON по контракту.',
 					providerId: 'Провайдер',
-					credentialRef: 'Credential',
+					credentialRef: 'Токен',
 					model: 'Модель',
 					timeoutMs: 'Таймаут (мс)',
 					retryMaxAttempts: 'Макс. попыток',

From 28b7c1545d755a700c5a68e301180e6608f3f89d Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Mon, 16 Mar 2026 23:08:49 +0300
Subject: [PATCH 22/54] fix: dsl

---
 .../template-runtime-dsl-spec-2026-03-16.md   |  619 ++++++
 server/package.json                           |    1 +
 .../expr/compile-expr.test.ts                 |   73 +
 .../expr/evaluate-expr.test.ts                |  166 ++
 .../template-runtime/expr/evaluator.ts        |  229 +++
 .../template-runtime/expr/expr-parser.js      | 1822 +++++++++++++++++
 .../template-runtime/expr/expr-parser.peggy   |  120 ++
 .../services/template-runtime/expr/parser.ts  |   17 +
 server/src/services/template-runtime/index.ts |   94 +
 .../macros/macro-runtime.test.ts              |  163 ++
 .../template-runtime/macros/registry.ts       |   75 +
 .../template-runtime/runtime/errors.ts        |    9 +
 .../template-runtime/runtime/helpers.ts       |  136 ++
 .../runtime/limits-and-integration.test.ts    |  130 ++
 .../services/template-runtime/runtime/path.ts |   43 +
 .../template-runtime/runtime/state.ts         |  184 ++
 .../template/compile-template.test.ts         |   74 +
 .../template-runtime/template/compiler.ts     |  167 ++
 .../template/render-template.test.ts          |  110 +
 .../template-runtime/template/renderer.ts     |  234 +++
 .../template/template-parser.js               | 1388 +++++++++++++
 .../template/template-parser.peggy            |   60 +
 server/src/services/template-runtime/types.ts |  201 ++
 server/yarn.lock                              |   31 +
 24 files changed, 6146 insertions(+)
 create mode 100644 knowledge-base/template-runtime-dsl-spec-2026-03-16.md
 create mode 100644 server/src/services/template-runtime/expr/compile-expr.test.ts
 create mode 100644 server/src/services/template-runtime/expr/evaluate-expr.test.ts
 create mode 100644 server/src/services/template-runtime/expr/evaluator.ts
 create mode 100644 server/src/services/template-runtime/expr/expr-parser.js
 create mode 100644 server/src/services/template-runtime/expr/expr-parser.peggy
 create mode 100644 server/src/services/template-runtime/expr/parser.ts
 create mode 100644 server/src/services/template-runtime/index.ts
 create mode 100644 server/src/services/template-runtime/macros/macro-runtime.test.ts
 create mode 100644 server/src/services/template-runtime/macros/registry.ts
 create mode 100644 server/src/services/template-runtime/runtime/errors.ts
 create mode 100644 server/src/services/template-runtime/runtime/helpers.ts
 create mode 100644 server/src/services/template-runtime/runtime/limits-and-integration.test.ts
 create mode 100644 server/src/services/template-runtime/runtime/path.ts
 create mode 100644 server/src/services/template-runtime/runtime/state.ts
 create mode 100644 server/src/services/template-runtime/template/compile-template.test.ts
 create mode 100644 server/src/services/template-runtime/template/compiler.ts
 create mode 100644 server/src/services/template-runtime/template/render-template.test.ts
 create mode 100644 server/src/services/template-runtime/template/renderer.ts
 create mode 100644 server/src/services/template-runtime/template/template-parser.js
 create mode 100644 server/src/services/template-runtime/template/template-parser.peggy
 create mode 100644 server/src/services/template-runtime/types.ts

diff --git a/knowledge-base/template-runtime-dsl-spec-2026-03-16.md b/knowledge-base/template-runtime-dsl-spec-2026-03-16.md
new file mode 100644
index 00000000..55db46b2
--- /dev/null
+++ b/knowledge-base/template-runtime-dsl-spec-2026-03-16.md
@@ -0,0 +1,619 @@
+# Spec: Native Template Runtime DSL
+
+_Date: 2026-03-16_
+
+## 1. Goal
+
+This document defines the target design for a new native template/runtime DSL in TaleSpinner.
+
+The goal is to replace LiquidJS as the primary template engine with a controlled runtime that:
+
+- separates text templating from deterministic data evaluation;
+- supports a minimal Handlebars-like template model;
+- preserves required TaleSpinner custom behavior;
+- preserves required SillyTavern compatibility syntax through aliases;
+- supports variables, scoped state, and reusable user-defined macros;
+- remains deterministic, inspectable, and safe to execute.
+
+This is a product/runtime spec, not an implementation task list.
+
+## 2. Motivation
+
+Current LiquidJS usage solves text interpolation but is a poor fit for structured deterministic evaluation.
+
+Example of the current pain:
+
+```txt
+{
+  "uwu": bool,
+  "ara": bool
+}
+
+uwu = true if the text below contains uwu in any form
+ara = true if the text below contains ara in any form
+
+text: {{lastUserMessage}}
+```
+
+This currently pushes a deterministic parsing task into an LLM or into text-assembly tricks.
+
+Target behavior:
+
+- deterministic checks like `contains(lastUserMessage, "uwu", "i")` must be evaluated directly by the runtime;
+- structured values like objects and arrays must be produced as typed runtime values first and serialized second;
+- text templates must remain useful for prompt assembly and UI-oriented rendering.
+
+## 3. Core Decision
+
+The new system MUST have two language surfaces over one shared runtime:
+
+1. `template` language
+   - used for prompt text, world info text, greeting templates, and similar string output;
+   - returns `string`.
+
+2. `expr` language
+   - used for deterministic computation, guard outputs, structured objects, booleans, arrays, and JSON-ready values;
+   - returns typed runtime values.
+
+Both languages MUST use:
+
+- the same base context;
+- the same helper registry;
+- the same variable/state model;
+- the same macro registry;
+- the same runtime limits and safety rules.
+
+## 4. Non-Goals
+
+The first version MUST NOT try to do the following:
+
+- full LiquidJS syntax compatibility;
+- full Handlebars syntax compatibility;
+- arbitrary JavaScript execution;
+- user-defined parser rules;
+- unrestricted recursive macro expansion;
+- unrestricted persistent mutable state;
+- implicit side effects from ordinary expressions.
+
+## 5. Runtime Model
+
+### 5.1 Context
+
+Base runtime context MUST be built from the existing `InstructionRenderContext`.
+
+At minimum it includes:
+
+- `char`
+- `user`
+- `chat`
+- `messages`
+- `rag`
+- `worldInfo`
+- `art`
+- `artByOpId`
+- `now`
+- `anchorBefore`
+- `anchorAfter`
+- `description`
+- `scenario`
+- `personality`
+- `system`
+- `promptSystem`
+- `persona`
+- `wiBefore`
+- `wiAfter`
+- `loreBefore`
+- `loreAfter`
+- `outlet`
+- `outletEntries`
+- `anTop`
+- `anBottom`
+- `emTop`
+- `emBottom`
+- `mesExamples`
+- `mesExamplesRaw`
+- `lastUserMessage`
+- `lastAssistantMessage`
+
+These names SHOULD remain stable across template and expr runtimes.
+
+### 5.2 State
+
+Runtime state MUST be separated from base context.
+
+Context is input data. State is mutable execution state.
+
+Target model:
+
+```ts
+type RuntimeState = {
+  scopes: {
+    local: Record<string, unknown>;
+    render: Record<string, unknown>;
+    turn: Record<string, unknown>;
+    session?: Record<string, unknown>;
+  };
+  trim?: {
+    pending: boolean;
+  };
+  rng: () => number;
+};
+```
+
+### 5.3 Scopes
+
+The runtime MUST support the following scopes:
+
+- `local`
+  - visible only inside the current block or current macro expansion.
+- `render`
+  - visible during the full current render/evaluation call.
+- `turn`
+  - visible during the current generation cycle.
+- `session`
+  - optional for v1 runtime contract, but reserved for future chat- or branch-level state.
+
+Rules:
+
+- reads MUST search from nearest scope to widest scope;
+- writes MUST require an explicit target scope if they are not `local`;
+- v1 default write scope SHOULD be `render`;
+- writes to `session` MUST be explicitly enabled by the caller and MUST NOT be implicit.
+
+## 6. Language Surfaces
+
+## 6.1 `expr` Language
+
+The `expr` language is the canonical language for deterministic evaluation.
+
+It MUST support:
+
+- literals
+  - `null`, `true`, `false`, numbers, strings
+- path lookup
+  - `char.name`
+  - `art.note.value`
+- arrays
+  - `["a", "b"]`
+- objects
+  - `{ uwu: true, ara: false }`
+- function calls
+  - `contains(lastUserMessage, "uwu", "i")`
+- unary operators
+  - `not x`
+- binary operators
+  - `and`
+  - `or`
+  - `==`
+  - `!=`
+
+Example:
+
+```txt
+{
+  uwu: contains(lastUserMessage, "uwu", "i"),
+  ara: contains(lastUserMessage, "ara", "i")
+}
+```
+
+This MUST evaluate to a typed object, not to text.
+
+## 6.2 `template` Language
+
+The `template` language is a text-producing language with Handlebars-like block semantics.
+
+The v1 native syntax MUST support:
+
+- output nodes
+  - `{{ char.name }}`
+  - `{{ contains(lastUserMessage, "uwu", "i") }}`
+- conditional blocks
+  - `{{#if contains(lastUserMessage, "uwu", "i")}}...{{else}}...{{/if}}`
+- iteration blocks
+  - `{{#each messages as msg}}...{{/each}}`
+- statement calls
+  - `{{ set("mood", "angry") }}`
+- macro calls
+  - `{{ use("sceneHeader", { char: char, user: user }) }}`
+
+The `template` language MUST render a string.
+
+## 6.3 Relationship Between `template` and `expr`
+
+`template` expressions MUST embed the same expression model as `expr`.
+
+This means:
+
+- one helper registry;
+- one lookup model;
+- one truthiness model;
+- one set of core value types.
+
+The runtime MUST NOT maintain different meanings for the same expression between `template` and `expr`.
+
+## 7. AST Model
+
+The runtime SHOULD normalize both languages into a small shared internal AST.
+
+Illustrative model:
+
+```ts
+type ExprNode =
+  | { kind: "literal"; value: null | boolean | number | string }
+  | { kind: "path"; segments: string[] }
+  | { kind: "call"; name: string; args: ExprNode[] }
+  | { kind: "array"; items: ExprNode[] }
+  | { kind: "object"; entries: Array<{ key: string; value: ExprNode }> }
+  | { kind: "unary"; op: "not"; value: ExprNode }
+  | {
+      kind: "binary";
+      op: "and" | "or" | "eq" | "neq";
+      left: ExprNode;
+      right: ExprNode;
+    };
+
+type TemplateNode =
+  | { kind: "text"; value: string }
+  | { kind: "output"; expr: ExprNode }
+  | { kind: "if"; condition: ExprNode; then: TemplateNode[]; else: TemplateNode[] }
+  | { kind: "each"; source: ExprNode; itemName: string; body: TemplateNode[] }
+  | { kind: "statement"; statement: StatementNode };
+
+type StatementNode =
+  | { kind: "trim" }
+  | { kind: "set"; scope: "local" | "render" | "turn" | "session"; name: string; value: ExprNode }
+  | { kind: "useMacro"; name: string; args: Record<string, ExprNode> };
+```
+
+Exact AST shapes may change, but the architecture SHOULD preserve this separation:
+
+- expressions are values;
+- statements are side effects;
+- blocks control rendering;
+- aliases lower into canonical nodes.
+
+## 8. Built-in Helpers
+
+The runtime MUST expose built-in helpers through a registry.
+
+Initial built-ins SHOULD include:
+
+- `contains(text, needle, flags?) -> boolean`
+- `match(text, pattern, flags?) -> boolean`
+- `lower(text) -> string`
+- `upper(text) -> string`
+- `trimText(text) -> string`
+- `size(value) -> number`
+- `empty(value) -> boolean`
+- `coalesce(a, b, ...) -> unknown`
+- `json(value) -> string`
+- `outlet(key) -> string`
+- `pickRandom(...values) -> unknown`
+- `recentMessages(count) -> Array<Message>`
+- `recentMessagesText(count) -> string`
+- `recentMessagesByContextTokens(limit) -> Array<Message>`
+- `recentMessagesByContextTokensText(limit) -> string`
+
+Rules:
+
+- helpers MUST be deterministic unless explicitly documented otherwise;
+- `pickRandom` MUST use runtime RNG, not ambient `Math.random`;
+- helper failures MUST surface as typed runtime errors;
+- helpers MUST NOT mutate state directly.
+
+## 9. Built-in Statements
+
+Statements are side-effectful runtime actions and MUST be modeled separately from helpers.
+
+Initial built-ins SHOULD include:
+
+- `trim`
+  - whitespace/layout control node
+- `set`
+  - set a variable in a target scope
+- `unset`
+  - remove a variable from a target scope
+- `capture`
+  - optional future node that renders nested template content into a variable
+
+Rules:
+
+- statements MUST be explicit;
+- statements MUST NOT masquerade as pure expressions;
+- statement effects MUST be visible in debug output.
+
+## 10. SillyTavern Compatibility Layer
+
+ST compatibility is required.
+
+The runtime MUST support ST aliases as a compatibility input layer without making them the canonical internal syntax.
+
+### 10.1 Design Rule
+
+ST syntax MUST parse into compatibility nodes or be lowered directly into canonical AST.
+
+Internal execution MUST operate on canonical runtime operations, not on raw ST syntax.
+
+### 10.2 Required Alias Categories
+
+The runtime MUST support three categories of ST aliases:
+
+1. value aliases
+2. state aliases
+3. formatting aliases
+
+### 10.3 Initial Required Aliases
+
+The following aliases are required in the first compatibility layer:
+
+- `{{outlet::default}}`
+- `{{random::A::B}}`
+- `{{trim}}`
+- `{{setvar::name::value}}`
+
+Canonical lowering examples:
+
+- `{{outlet::default}}`
+  - lower to `outlet("default")`
+- `{{random::A::B}}`
+  - lower to `pickRandom("A", "B")`
+- `{{trim}}`
+  - lower to `trim` statement node
+- `{{setvar::mood::angry}}`
+  - lower to `set(scope="render", name="mood", value="angry")`
+
+### 10.4 Future Alias Support
+
+Additional ST aliases MAY be added later through a whitelist-based compatibility registry.
+
+Unknown ST alias syntax MUST fail with a clear validation error.
+
+The runtime MUST NOT silently accept unknown alias forms.
+
+## 11. Macro System
+
+## 11.1 Goal
+
+Users MUST be able to define reusable macros in a dedicated UI and reuse them across templates.
+
+Macros are a first-class runtime feature, not a text-replace hack.
+
+## 11.2 Macro Kinds
+
+The system SHOULD support these macro kinds:
+
+- `value`
+  - returns a typed value from expressions
+- `template`
+  - returns rendered template output
+
+The first release SHOULD NOT expose user-defined stateful statement macros.
+
+Built-in statement macros MAY exist internally, but user-defined macros SHOULD stay constrained.
+
+## 11.3 Macro Storage
+
+Macros SHOULD be stored as separate entities, not inline inside arbitrary templates.
+
+Illustrative shape:
+
+```ts
+type MacroDefinition = {
+  id: string;
+  ownerId: string;
+  name: string;
+  kind: "value" | "template";
+  description?: string;
+  engine: "native_v1";
+  params: Array<{
+    name: string;
+    required: boolean;
+    defaultExpr?: string;
+  }>;
+  body: string;
+  createdAt: string;
+  updatedAt: string;
+};
+```
+
+## 11.4 Macro Invocation
+
+Illustrative canonical forms:
+
+```txt
+use("sceneHeader", { char: char, user: user })
+call("detectTone", { text: lastUserMessage })
+```
+
+Template usage example:
+
+```txt
+{{ use("sceneHeader", { char: char, user: user }) }}
+```
+
+Expression usage example:
+
+```txt
+call("detectFlags", { text: lastUserMessage })
+```
+
+## 11.5 Macro Semantics
+
+Rules:
+
+- macro invocation MUST create a fresh local scope;
+- macro arguments MUST be bound by name;
+- macro expansion MUST be debuggable;
+- recursive macro calls MUST be limited;
+- recursive cycles MUST be detected;
+- macros MUST lower into AST or execute through the same runtime, not through raw string substitution.
+
+## 12. Validation and Error Model
+
+The runtime MUST provide explicit validation entry points:
+
+- `validateTemplate(source)`
+- `validateExpr(source)`
+- `validateMacro(definition)`
+
+The error model SHOULD distinguish:
+
+- parse errors
+- unknown helper errors
+- unknown alias errors
+- unknown macro errors
+- invalid path errors in strict mode
+- runtime helper failures
+- macro cycle errors
+- scope access errors
+- output limit errors
+
+The system MUST expose user-facing error messages and machine-readable error codes.
+
+## 13. Strictness
+
+The runtime MUST support strict and non-strict variable access.
+
+Suggested behavior:
+
+- strict mode
+  - missing path or missing variable is an error
+- non-strict mode
+  - missing path resolves to `null` or empty string depending on output context
+
+The exact null/empty-string coercion rules MUST be consistent across the system and documented once in runtime docs.
+
+## 14. Whitespace and Layout
+
+Whitespace control MUST be explicit.
+
+`trim` is special because it affects surrounding rendered text, not just a returned value.
+
+Therefore:
+
+- `trim` MUST remain a statement/layout node;
+- whitespace control MUST NOT be modeled only as a normal string helper;
+- macro expansion and block rendering MUST preserve deterministic trim behavior.
+
+## 15. Determinism and Safety
+
+The runtime MUST be deterministic for the same input.
+
+The runtime MUST NOT allow:
+
+- arbitrary filesystem access;
+- arbitrary network access;
+- ambient mutable globals;
+- arbitrary JS execution;
+- unbounded recursion;
+- unbounded AST growth;
+- unbounded output growth.
+
+Required limits:
+
+- max macro expansion depth
+- max AST node count after lowering
+- max execution steps
+- max output chars
+- max object/array nesting
+
+## 16. Debuggability
+
+The runtime SHOULD expose debug artifacts for development and diagnostics:
+
+- parsed AST
+- lowered AST after alias normalization
+- expanded macro tree
+- runtime variable scopes
+- helper calls
+- stop reason on limits or failures
+
+This is important because the system is more than a template engine. It is a small controlled interpreter.
+
+## 17. Integration Targets
+
+The new runtime is intended to replace LiquidJS as the primary engine in these areas:
+
+- instruction text rendering
+- operation template rendering
+- LLM prompt and system rendering
+- deterministic guard evaluation
+- world info text rendering
+- greeting template rendering
+- manual chat edit rendering
+
+Important architectural note:
+
+- deterministic guards SHOULD prefer `expr` over text templates whenever possible;
+- building JSON by hand in text templates SHOULD NOT be the primary path for deterministic outputs.
+
+## 18. Rollout Strategy
+
+Recommended rollout:
+
+1. Implement shared runtime core
+   - context
+   - state
+   - helper registry
+   - expr parser and evaluator
+
+2. Implement minimal template runtime
+   - text
+   - output
+   - `if`
+   - `each`
+   - `trim`
+   - `set`
+
+3. Add ST compatibility aliases
+   - whitelist only
+
+4. Add macro registry
+   - storage
+   - validation
+   - invocation
+   - recursion guards
+
+5. Migrate product surfaces to native runtime
+   - start from deterministic guard/compute cases
+   - then prompt/instruction rendering
+
+## 19. Agreed Principles
+
+The implementation MUST follow these principles:
+
+- native syntax is canonical;
+- ST syntax is compatibility-only;
+- no LiquidJS compatibility target;
+- text templating and deterministic evaluation are separate concerns;
+- aliases normalize into canonical operations;
+- user macros are data, not parser extensions;
+- expressions are pure;
+- statements are explicit;
+- state scopes are controlled and bounded;
+- debugability is a hard requirement, not optional polish.
+
+## 20. Open Decisions Requiring Agreement
+
+These items still need explicit agreement before implementation:
+
+1. Should `session` scope be in v1 runtime or reserved for v2 only?
+2. Should `setvar::` default to `render` scope or `turn` scope?
+3. Should user-defined macros be limited to `value` and `template` in v1, with no user-defined statement macros?
+4. Should template invocation use only canonical `use("name", {...})` syntax in v1, with no extra shorthand?
+5. What exact ST alias whitelist is required in the first compatibility pass beyond:
+   - `trim`
+   - `outlet::`
+   - `random::`
+   - `setvar::`
+
+## 21. Recommended Default Answers
+
+Unless product requirements change, this spec recommends:
+
+1. `session` scope is reserved but not enabled by default in v1.
+2. `setvar::` defaults to `render` scope in v1.
+3. User-defined macros are limited to `value` and `template` in v1.
+4. Canonical macro invocation in v1 is only `use("name", {...})` and `call("name", {...})`.
+5. ST alias support in v1 is whitelist-based and intentionally narrow.
+
diff --git a/server/package.json b/server/package.json
index 1a027fd6..e679bbab 100644
--- a/server/package.json
+++ b/server/package.json
@@ -73,6 +73,7 @@
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "globals": "^17.0.0",
+    "peggy": "^5.1.0",
     "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0",
     "tsc-alias": "^1.8.16",
diff --git a/server/src/services/template-runtime/expr/compile-expr.test.ts b/server/src/services/template-runtime/expr/compile-expr.test.ts
new file mode 100644
index 00000000..c1853c1d
--- /dev/null
+++ b/server/src/services/template-runtime/expr/compile-expr.test.ts
@@ -0,0 +1,73 @@
+import { describe, expect, test } from "vitest";
+
+import { compileExpr, validateExpr, type RuntimeError } from "../index";
+
+describe("template-runtime/compileExpr", () => {
+  test("parses literals, paths, arrays, and objects", () => {
+    expect(compileExpr("null")).toMatchObject({ kind: "literal", value: null });
+    expect(compileExpr("true")).toMatchObject({ kind: "literal", value: true });
+    expect(compileExpr("42")).toMatchObject({ kind: "literal", value: 42 });
+    expect(compileExpr('"hello"')).toMatchObject({ kind: "literal", value: "hello" });
+    expect(compileExpr("char.name")).toMatchObject({
+      kind: "path",
+      segments: ["char", "name"],
+    });
+    expect(compileExpr("[1, 2, 3]")).toMatchObject({
+      kind: "array",
+      items: [{ kind: "literal", value: 1 }, { kind: "literal", value: 2 }, { kind: "literal", value: 3 }],
+    });
+    expect(compileExpr('{ uwu: true, "ara": false }')).toMatchObject({
+      kind: "object",
+      entries: [
+        { key: "uwu", value: { kind: "literal", value: true } },
+        { key: "ara", value: { kind: "literal", value: false } },
+      ],
+    });
+  });
+
+  test("preserves precedence and associativity", () => {
+    expect(compileExpr("not a and b or c")).toMatchObject({
+      kind: "binary",
+      op: "or",
+      left: {
+        kind: "binary",
+        op: "and",
+        left: {
+          kind: "unary",
+          op: "not",
+          value: { kind: "path", segments: ["a"] },
+        },
+        right: { kind: "path", segments: ["b"] },
+      },
+      right: { kind: "path", segments: ["c"] },
+    });
+  });
+
+  test("parses function calls and nested expressions", () => {
+    expect(compileExpr('contains(lastUserMessage, "uwu", "i")')).toMatchObject({
+      kind: "call",
+      name: "contains",
+      args: [
+        { kind: "path", segments: ["lastUserMessage"] },
+        { kind: "literal", value: "uwu" },
+        { kind: "literal", value: "i" },
+      ],
+    });
+  });
+
+  test("validateExpr accepts valid sources and rejects invalid ones", () => {
+    expect(() => validateExpr('{ uwu: contains(lastUserMessage, "uwu", "i") }')).not.toThrow();
+    expect(() => validateExpr("char.name == ")).toThrow();
+  });
+
+  test("throws typed parse errors", () => {
+    try {
+      compileExpr("[1,");
+      throw new Error("expected parse error");
+    } catch (error) {
+      const runtimeError = error as RuntimeError;
+      expect(runtimeError.code).toBe("EXPR_PARSE_ERROR");
+      expect(runtimeError.message).toContain("Expected");
+    }
+  });
+});
diff --git a/server/src/services/template-runtime/expr/evaluate-expr.test.ts b/server/src/services/template-runtime/expr/evaluate-expr.test.ts
new file mode 100644
index 00000000..7f1ecf03
--- /dev/null
+++ b/server/src/services/template-runtime/expr/evaluate-expr.test.ts
@@ -0,0 +1,166 @@
+import { describe, expect, test } from "vitest";
+
+import { evaluateExpr, type InstructionRenderContext, type RuntimeError } from "../index";
+
+function makeContext(): InstructionRenderContext {
+  return {
+    char: { name: "Alice" },
+    user: { name: "User" },
+    chat: { title: "Chat" },
+    messages: [
+      { role: "system", content: "S0" },
+      { role: "assistant", content: "A1" },
+      { role: "user", content: "U1 uwu" },
+      { role: "assistant", content: "A2 ara" },
+      { role: "user", content: "U2 uwu ara" },
+    ],
+    rag: {},
+    art: {
+      note: { value: "memo", history: ["memo"] },
+    },
+    promptSystem: "SYS",
+    outlet: {
+      default: "OUTLET_TEXT",
+    },
+    lastUserMessage: "U2 uwu ara",
+    lastAssistantMessage: "A2 ara",
+    now: new Date("2026-03-16T00:00:00.000Z").toISOString(),
+  };
+}
+
+describe("template-runtime/evaluateExpr", () => {
+  test("resolves paths and missing values in non-strict mode", () => {
+    expect(
+      evaluateExpr({
+        source: "char.name",
+        context: makeContext(),
+      })
+    ).toBe("Alice");
+
+    expect(
+      evaluateExpr({
+        source: "missing.value",
+        context: makeContext(),
+      })
+    ).toBeNull();
+  });
+
+  test("throws on missing values in strict mode", () => {
+    expect(() =>
+      evaluateExpr({
+        source: "missing.value",
+        context: makeContext(),
+        options: {
+          strictVariables: true,
+        },
+      })
+    ).toThrow();
+  });
+
+  test("evaluates booleans, equality, arrays, and objects", () => {
+    expect(
+      evaluateExpr({
+        source: 'contains(lastUserMessage, "uwu", "i") and char.name == "Alice"',
+        context: makeContext(),
+      })
+    ).toBe(true);
+
+    expect(
+      evaluateExpr({
+        source: '{ uwu: contains(lastUserMessage, "uwu", "i"), ara: contains(lastUserMessage, "ara", "i") }',
+        context: makeContext(),
+      })
+    ).toEqual({
+      uwu: true,
+      ara: true,
+    });
+  });
+
+  test("supports helper registry semantics", () => {
+    expect(
+      evaluateExpr({
+        source: "size(recentMessages(2))",
+        context: makeContext(),
+      })
+    ).toBe(2);
+
+    expect(
+      evaluateExpr({
+        source: 'recentMessagesText(2)',
+        context: makeContext(),
+      })
+    ).toBe("assistant: A2 ara\nuser: U2 uwu ara");
+
+    expect(
+      evaluateExpr({
+        source: "outlet('default')",
+        context: makeContext(),
+      })
+    ).toBe("OUTLET_TEXT");
+  });
+
+  test("uses deterministic rng for pickRandom", () => {
+    expect(
+      evaluateExpr({
+        source: 'pickRandom("A", "B", "C")',
+        context: makeContext(),
+        options: {
+          rng: () => 0,
+        },
+      })
+    ).toBe("A");
+
+    expect(
+      evaluateExpr({
+        source: 'pickRandom("A", "B", "C")',
+        context: makeContext(),
+        options: {
+          rng: () => 0.999999,
+        },
+      })
+    ).toBe("C");
+  });
+
+  test("reads variables from render and turn scopes", () => {
+    expect(
+      evaluateExpr({
+        source: "flag",
+        context: makeContext(),
+        state: {
+          scopes: {
+            local: {},
+            render: { flag: "render-flag" },
+            turn: { flag: "turn-flag" },
+          },
+        },
+      })
+    ).toBe("render-flag");
+
+    expect(
+      evaluateExpr({
+        source: "turnOnly",
+        context: makeContext(),
+        state: {
+          scopes: {
+            local: {},
+            render: {},
+            turn: { turnOnly: 7 },
+          },
+        },
+      })
+    ).toBe(7);
+  });
+
+  test("throws typed helper errors", () => {
+    try {
+      evaluateExpr({
+        source: 'match(lastUserMessage, "[", "i")',
+        context: makeContext(),
+      });
+      throw new Error("expected helper error");
+    } catch (error) {
+      const runtimeError = error as RuntimeError;
+      expect(runtimeError.code).toBe("HELPER_ERROR");
+    }
+  });
+});
diff --git a/server/src/services/template-runtime/expr/evaluator.ts b/server/src/services/template-runtime/expr/evaluator.ts
new file mode 100644
index 00000000..07ed2350
--- /dev/null
+++ b/server/src/services/template-runtime/expr/evaluator.ts
@@ -0,0 +1,229 @@
+import { runtimeError } from "../runtime/errors";
+import { invokeHelper } from "../runtime/helpers";
+import { resolvePathValue } from "../runtime/path";
+import { popLocalScope, popMacro, pushLocalScope, pushMacro, snapshotRuntimeState, step } from "../runtime/state";
+
+import { parseExpr } from "./parser";
+
+import type { ExecutionState } from "../runtime/state";
+import type { CompiledMacroDefinition, ExprAst, ExprNode, InstructionRenderContext, MacroRegistry } from "../types";
+
+type EvaluateExprParams = {
+  ast: ExprAst;
+  context: InstructionRenderContext;
+  state: ExecutionState;
+  macros?: MacroRegistry;
+  nesting?: number;
+};
+
+function assertNesting(state: ExecutionState, nesting: number): void {
+  if (nesting > state.options.maxObjectNesting) {
+    throw runtimeError("LIMIT_EXCEEDED", "runtime exceeded maxObjectNesting", {
+      maxObjectNesting: state.options.maxObjectNesting,
+      nesting,
+    });
+  }
+}
+
+function valuesEqual(left: unknown, right: unknown): boolean {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
+
+function isTruthy(value: unknown): boolean {
+  return value ? true : false;
+}
+
+function toArgRecord(value: unknown): Record<string, unknown> {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return value as Record<string, unknown>;
+}
+
+function bindMacroParams(
+  macro: CompiledMacroDefinition,
+  providedArgs: Record<string, unknown>,
+  context: InstructionRenderContext,
+  state: ExecutionState,
+  macros?: MacroRegistry
+): Record<string, unknown> {
+  const bound: Record<string, unknown> = {};
+
+  for (const param of macro.params) {
+    if (param.name in providedArgs) {
+      bound[param.name] = providedArgs[param.name];
+      continue;
+    }
+
+    if (param.defaultExpr) {
+      bound[param.name] = evaluateExprNode({
+        ast: parseExpr(param.defaultExpr),
+        context,
+        state,
+        macros,
+      });
+      continue;
+    }
+
+    if (param.required) {
+      throw runtimeError("INVALID_MACRO", `Missing required macro param: ${param.name}`, {
+        macro: macro.name,
+        param: param.name,
+      });
+    }
+
+    bound[param.name] = null;
+  }
+
+  return bound;
+}
+
+export function evaluateExprNode(params: EvaluateExprParams): unknown {
+  step(params.state, `expr:${params.ast.kind}`);
+  const nesting = params.nesting ?? 0;
+  assertNesting(params.state, nesting);
+
+  switch (params.ast.kind) {
+    case "literal":
+      return params.ast.value;
+    case "path":
+      return resolvePathValue({
+        segments: params.ast.segments,
+        context: params.context,
+        state: params.state,
+      });
+    case "array":
+      return params.ast.items.map((item) =>
+        evaluateExprNode({
+          ast: item,
+          context: params.context,
+          state: params.state,
+          macros: params.macros,
+          nesting: nesting + 1,
+        })
+      );
+    case "object":
+      return Object.fromEntries(
+        params.ast.entries.map((entry) => [
+          entry.key,
+          evaluateExprNode({
+            ast: entry.value,
+            context: params.context,
+            state: params.state,
+            macros: params.macros,
+            nesting: nesting + 1,
+          }),
+        ])
+      );
+    case "unary":
+      return !isTruthy(
+        evaluateExprNode({
+          ast: params.ast.value,
+          context: params.context,
+          state: params.state,
+          macros: params.macros,
+          nesting: nesting + 1,
+        })
+      );
+    case "binary": {
+      const left = evaluateExprNode({
+        ast: params.ast.left,
+        context: params.context,
+        state: params.state,
+        macros: params.macros,
+        nesting: nesting + 1,
+      });
+
+      if (params.ast.op === "and") {
+        return isTruthy(left)
+          ? isTruthy(
+              evaluateExprNode({
+                ast: params.ast.right,
+                context: params.context,
+                state: params.state,
+                macros: params.macros,
+                nesting: nesting + 1,
+              })
+            )
+          : false;
+      }
+
+      if (params.ast.op === "or") {
+        return isTruthy(left)
+          ? true
+          : isTruthy(
+              evaluateExprNode({
+                ast: params.ast.right,
+                context: params.context,
+                state: params.state,
+                macros: params.macros,
+                nesting: nesting + 1,
+              })
+            );
+      }
+
+      const right = evaluateExprNode({
+        ast: params.ast.right,
+        context: params.context,
+        state: params.state,
+        macros: params.macros,
+        nesting: nesting + 1,
+      });
+
+      return params.ast.op === "eq" ? valuesEqual(left, right) : !valuesEqual(left, right);
+    }
+    case "call":
+      return evaluateCall(params.ast, params.context, params.state, params.macros, nesting + 1);
+  }
+}
+
+function evaluateCall(
+  node: Extract<ExprNode, { kind: "call" }>,
+  context: InstructionRenderContext,
+  state: ExecutionState,
+  macros?: MacroRegistry,
+  nesting = 0
+): unknown {
+  const args = node.args.map((arg) =>
+    evaluateExprNode({
+      ast: arg,
+      context,
+      state,
+      macros,
+      nesting,
+    })
+  );
+
+  if (node.name === "call") {
+    const macroName = typeof args[0] === "string" ? args[0] : "";
+    const macro = macros?.getCompiled(macroName);
+    if (!macro || macro.kind !== "value") {
+      throw runtimeError("UNKNOWN_MACRO", `Unknown value macro: ${macroName}`, { macroName });
+    }
+
+    pushMacro(state, macroName);
+    try {
+      pushLocalScope(state, bindMacroParams(macro, toArgRecord(args[1]), context, state, macros));
+      const result = evaluateExprNode({
+        ast: macro.body,
+        context,
+        state,
+        macros,
+        nesting,
+      });
+      popLocalScope(state);
+      return result;
+    } finally {
+      popMacro(state);
+    }
+  }
+
+  if (node.name === "use") {
+    throw runtimeError("INVALID_MACRO", "use() is not available in expr runtime");
+  }
+
+  return invokeHelper(node.name, {
+    args,
+    context,
+    state: snapshotRuntimeState(state),
+    options: state.options,
+  });
+}
diff --git a/server/src/services/template-runtime/expr/expr-parser.js b/server/src/services/template-runtime/expr/expr-parser.js
new file mode 100644
index 00000000..bfe938c6
--- /dev/null
+++ b/server/src/services/template-runtime/expr/expr-parser.js
@@ -0,0 +1,1822 @@
+/* eslint-disable */
+// @generated by Peggy 5.1.0.
+//
+// https://peggyjs.org/
+
+"use strict";
+
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
+
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
+
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
+
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
+
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
+
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
+
+      any() {
+        return "any character";
+      },
+
+      end() {
+        return "end of input";
+      },
+
+      other(expectation) {
+        return expectation.description;
+      },
+    };
+
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    }
+
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
+
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
+
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
+
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
+
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
+      }
+    }
+
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    }
+
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+  }
+}
+
+function peg$parse(input, options) {
+  options = options !== undefined ? options : {};
+
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
+
+  const peg$startRuleFunctions = {
+    start: peg$parsestart,
+  };
+  let peg$startRuleFunction = peg$parsestart;
+
+  const peg$c0 = "or";
+  const peg$c1 = "and";
+  const peg$c2 = "==";
+  const peg$c3 = "!=";
+  const peg$c4 = "not";
+  const peg$c5 = "(";
+  const peg$c6 = ")";
+  const peg$c7 = ",";
+  const peg$c8 = ".";
+  const peg$c9 = "[";
+  const peg$c10 = "]";
+  const peg$c11 = "{";
+  const peg$c12 = "}";
+  const peg$c13 = ":";
+  const peg$c14 = "null";
+  const peg$c15 = "true";
+  const peg$c16 = "false";
+  const peg$c17 = "-";
+  const peg$c18 = "\"";
+  const peg$c19 = "'";
+  const peg$c20 = "\\n";
+  const peg$c21 = "\\r";
+  const peg$c22 = "\\t";
+  const peg$c23 = "\\\"";
+  const peg$c24 = "\\\\";
+  const peg$c25 = "\\'";
+
+  const peg$r0 = /^[0-9]/;
+  const peg$r1 = /^[a-zA-Z_]/;
+  const peg$r2 = /^[a-zA-Z0-9_]/;
+  const peg$r3 = /^[ \t\r\n]/;
+
+  const peg$e0 = peg$literalExpectation("or", false);
+  const peg$e1 = peg$literalExpectation("and", false);
+  const peg$e2 = peg$literalExpectation("==", false);
+  const peg$e3 = peg$literalExpectation("!=", false);
+  const peg$e4 = peg$literalExpectation("not", false);
+  const peg$e5 = peg$literalExpectation("(", false);
+  const peg$e6 = peg$literalExpectation(")", false);
+  const peg$e7 = peg$literalExpectation(",", false);
+  const peg$e8 = peg$literalExpectation(".", false);
+  const peg$e9 = peg$literalExpectation("[", false);
+  const peg$e10 = peg$literalExpectation("]", false);
+  const peg$e11 = peg$literalExpectation("{", false);
+  const peg$e12 = peg$literalExpectation("}", false);
+  const peg$e13 = peg$literalExpectation(":", false);
+  const peg$e14 = peg$literalExpectation("null", false);
+  const peg$e15 = peg$literalExpectation("true", false);
+  const peg$e16 = peg$literalExpectation("false", false);
+  const peg$e17 = peg$literalExpectation("-", false);
+  const peg$e18 = peg$classExpectation([["0", "9"]], false, false, false);
+  const peg$e19 = peg$literalExpectation("\"", false);
+  const peg$e20 = peg$literalExpectation("'", false);
+  const peg$e21 = peg$literalExpectation("\\n", false);
+  const peg$e22 = peg$literalExpectation("\\r", false);
+  const peg$e23 = peg$literalExpectation("\\t", false);
+  const peg$e24 = peg$literalExpectation("\\\"", false);
+  const peg$e25 = peg$literalExpectation("\\\\", false);
+  const peg$e26 = peg$anyExpectation();
+  const peg$e27 = peg$literalExpectation("\\'", false);
+  const peg$e28 = peg$classExpectation([["a", "z"], ["A", "Z"], "_"], false, false, false);
+  const peg$e29 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false, false);
+  const peg$e30 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false, false);
+
+  function peg$f0(expr) {    return expr;  }
+  function peg$f1(head, right) {    return right;  }
+  function peg$f2(head, tail) {
+    return tail.reduce((left, right) => binary("or", left, right), head);
+  }
+  function peg$f3(head, right) {    return right;  }
+  function peg$f4(head, tail) {
+    return tail.reduce((left, right) => binary("and", left, right), head);
+  }
+  function peg$f5(head, op, right) {    return { op, right };  }
+  function peg$f6(head, tail) {
+    return tail.reduce(
+      (left, item) => binary(item.op === "==" ? "eq" : "neq", left, item.right),
+      head
+    );
+  }
+  function peg$f7(value) {    return { kind: "unary", op: "not", value };  }
+  function peg$f8(expr) {    return expr;  }
+  function peg$f9(name, args) {
+    return { kind: "call", name, args: args ?? [] };
+  }
+  function peg$f10(head, value) {    return value;  }
+  function peg$f11(head, tail) {
+    return [head, ...tail];
+  }
+  function peg$f12(head, segment) {    return segment;  }
+  function peg$f13(head, tail) {
+    return { kind: "path", segments: [head, ...tail] };
+  }
+  function peg$f14(items) {
+    return { kind: "array", items: items ?? [] };
+  }
+  function peg$f15(entries) {
+    return { kind: "object", entries: entries ?? [] };
+  }
+  function peg$f16(head, entry) {    return entry;  }
+  function peg$f17(head, tail) {
+    return [head, ...tail];
+  }
+  function peg$f18(key, value) {
+    return { key, value };
+  }
+  function peg$f19() {    return { kind: "literal", value: null };  }
+  function peg$f20() {    return { kind: "literal", value: true };  }
+  function peg$f21() {    return { kind: "literal", value: false };  }
+  function peg$f22(value) {
+    return { kind: "literal", value: Number(value) };
+  }
+  function peg$f23(value) {    return { kind: "literal", value };  }
+  function peg$f24(chars) {    return chars.join("");  }
+  function peg$f25(chars) {    return chars.join("");  }
+  function peg$f26() {    return "\n";  }
+  function peg$f27() {    return "\r";  }
+  function peg$f28() {    return "\t";  }
+  function peg$f29() {    return '"';  }
+  function peg$f30() {    return "\\";  }
+  function peg$f31(char) {    return char;  }
+  function peg$f32() {    return "\n";  }
+  function peg$f33() {    return "\r";  }
+  function peg$f34() {    return "\t";  }
+  function peg$f35() {    return "'";  }
+  function peg$f36() {    return "\\";  }
+  function peg$f37(char) {    return char;  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
+
+  let peg$result;
+
+  if (options.startRule) {
+    if (!(options.startRule in peg$startRuleFunctions)) {
+      throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
+    }
+
+    peg$startRuleFunction = peg$startRuleFunctions[options.startRule];
+  }
+
+  function text() {
+    return input.substring(peg$savedPos, peg$currPos);
+  }
+
+  function offset() {
+    return peg$savedPos;
+  }
+
+  function range() {
+    return {
+      source: peg$source,
+      start: peg$savedPos,
+      end: peg$currPos,
+    };
+  }
+
+  function location() {
+    return peg$computeLocation(peg$savedPos, peg$currPos);
+  }
+
+  function expected(description, location) {
+    location = location !== undefined
+      ? location
+      : peg$computeLocation(peg$savedPos, peg$currPos);
+
+    throw peg$buildStructuredError(
+      [peg$otherExpectation(description)],
+      input.substring(peg$savedPos, peg$currPos),
+      location
+    );
+  }
+
+  function error(message, location) {
+    location = location !== undefined
+      ? location
+      : peg$computeLocation(peg$savedPos, peg$currPos);
+
+    throw peg$buildSimpleError(message, location);
+  }
+
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
+  function peg$literalExpectation(text, ignoreCase) {
+    return { type: "literal", text, ignoreCase };
+  }
+
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
+  }
+
+  function peg$anyExpectation() {
+    return { type: "any" };
+  }
+
+  function peg$endExpectation() {
+    return { type: "end" };
+  }
+
+  function peg$otherExpectation(description) {
+    return { type: "other", description };
+  }
+
+  function peg$computePosDetails(pos) {
+    let details = peg$posDetailsCache[pos];
+    let p;
+
+    if (details) {
+      return details;
+    } else {
+      if (pos >= peg$posDetailsCache.length) {
+        p = peg$posDetailsCache.length - 1;
+      } else {
+        p = pos;
+        while (!peg$posDetailsCache[--p]) {}
+      }
+
+      details = peg$posDetailsCache[p];
+      details = {
+        line: details.line,
+        column: details.column,
+      };
+
+      while (p < pos) {
+        if (input.charCodeAt(p) === 10) {
+          details.line++;
+          details.column = 1;
+        } else {
+          details.column++;
+        }
+
+        p++;
+      }
+
+      peg$posDetailsCache[pos] = details;
+
+      return details;
+    }
+  }
+
+  function peg$computeLocation(startPos, endPos, offset) {
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
+
+    const res = {
+      source: peg$source,
+      start: {
+        offset: startPos,
+        line: startPosDetails.line,
+        column: startPosDetails.column,
+      },
+      end: {
+        offset: endPos,
+        line: endPosDetails.line,
+        column: endPosDetails.column,
+      },
+    };
+    if (offset && peg$source && (typeof peg$source.offset === "function")) {
+      res.start = peg$source.offset(res.start);
+      res.end = peg$source.offset(res.end);
+    }
+    return res;
+  }
+
+  function peg$fail(expected) {
+    if (peg$currPos < peg$maxFailPos) { return; }
+
+    if (peg$currPos > peg$maxFailPos) {
+      peg$maxFailPos = peg$currPos;
+      peg$maxFailExpected = [];
+    }
+
+    peg$maxFailExpected.push(expected);
+  }
+
+  function peg$buildSimpleError(message, location) {
+    return new peg$SyntaxError(message, null, null, location);
+  }
+
+  function peg$buildStructuredError(expected, found, location) {
+    return new peg$SyntaxError(
+      peg$SyntaxError.buildMessage(expected, found),
+      expected,
+      found,
+      location
+    );
+  }
+
+  function peg$parsestart() {
+    let s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    s2 = peg$parseor_expr();
+    if (s2 !== peg$FAILED) {
+      s3 = peg$parse_();
+      peg$savedPos = s0;
+      s0 = peg$f0(s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseor_expr() {
+    let s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parseand_expr();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse_();
+      if (input.substr(peg$currPos, 2) === peg$c0) {
+        s5 = peg$c0;
+        peg$currPos += 2;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e0); }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse__();
+        if (s6 !== peg$FAILED) {
+          s7 = peg$parseand_expr();
+          if (s7 !== peg$FAILED) {
+            peg$savedPos = s3;
+            s3 = peg$f1(s1, s7);
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse_();
+        if (input.substr(peg$currPos, 2) === peg$c0) {
+          s5 = peg$c0;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e0); }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse__();
+          if (s6 !== peg$FAILED) {
+            s7 = peg$parseand_expr();
+            if (s7 !== peg$FAILED) {
+              peg$savedPos = s3;
+              s3 = peg$f1(s1, s7);
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f2(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseand_expr() {
+    let s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parseequality_expr();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse_();
+      if (input.substr(peg$currPos, 3) === peg$c1) {
+        s5 = peg$c1;
+        peg$currPos += 3;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e1); }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse__();
+        if (s6 !== peg$FAILED) {
+          s7 = peg$parseequality_expr();
+          if (s7 !== peg$FAILED) {
+            peg$savedPos = s3;
+            s3 = peg$f3(s1, s7);
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse_();
+        if (input.substr(peg$currPos, 3) === peg$c1) {
+          s5 = peg$c1;
+          peg$currPos += 3;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e1); }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse__();
+          if (s6 !== peg$FAILED) {
+            s7 = peg$parseequality_expr();
+            if (s7 !== peg$FAILED) {
+              peg$savedPos = s3;
+              s3 = peg$f3(s1, s7);
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f4(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseequality_expr() {
+    let s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parseunary_expr();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse_();
+      if (input.substr(peg$currPos, 2) === peg$c2) {
+        s5 = peg$c2;
+        peg$currPos += 2;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e2); }
+      }
+      if (s5 === peg$FAILED) {
+        if (input.substr(peg$currPos, 2) === peg$c3) {
+          s5 = peg$c3;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e3); }
+        }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse_();
+        s7 = peg$parseunary_expr();
+        if (s7 !== peg$FAILED) {
+          peg$savedPos = s3;
+          s3 = peg$f5(s1, s5, s7);
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse_();
+        if (input.substr(peg$currPos, 2) === peg$c2) {
+          s5 = peg$c2;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e2); }
+        }
+        if (s5 === peg$FAILED) {
+          if (input.substr(peg$currPos, 2) === peg$c3) {
+            s5 = peg$c3;
+            peg$currPos += 2;
+          } else {
+            s5 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e3); }
+          }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse_();
+          s7 = peg$parseunary_expr();
+          if (s7 !== peg$FAILED) {
+            peg$savedPos = s3;
+            s3 = peg$f5(s1, s5, s7);
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f6(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseunary_expr() {
+    let s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 3) === peg$c4) {
+      s1 = peg$c4;
+      peg$currPos += 3;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e4); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse__();
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parseunary_expr();
+        if (s3 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f7(s3);
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseprimary();
+    }
+
+    return s0;
+  }
+
+  function peg$parseprimary() {
+    let s0, s1, s2, s3, s4, s5;
+
+    s0 = peg$parsecall();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseliteral();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsearray();
+        if (s0 === peg$FAILED) {
+          s0 = peg$parseobject();
+          if (s0 === peg$FAILED) {
+            s0 = peg$parsepath();
+            if (s0 === peg$FAILED) {
+              s0 = peg$currPos;
+              if (input.charCodeAt(peg$currPos) === 40) {
+                s1 = peg$c5;
+                peg$currPos++;
+              } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e5); }
+              }
+              if (s1 !== peg$FAILED) {
+                s2 = peg$parse_();
+                s3 = peg$parseor_expr();
+                if (s3 !== peg$FAILED) {
+                  s4 = peg$parse_();
+                  if (input.charCodeAt(peg$currPos) === 41) {
+                    s5 = peg$c6;
+                    peg$currPos++;
+                  } else {
+                    s5 = peg$FAILED;
+                    if (peg$silentFails === 0) { peg$fail(peg$e6); }
+                  }
+                  if (s5 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s0 = peg$f8(s3);
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsecall() {
+    let s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parseidentifier();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (input.charCodeAt(peg$currPos) === 40) {
+        s3 = peg$c5;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e5); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse_();
+        s5 = peg$parsearg_list();
+        if (s5 === peg$FAILED) {
+          s5 = null;
+        }
+        s6 = peg$parse_();
+        if (input.charCodeAt(peg$currPos) === 41) {
+          s7 = peg$c6;
+          peg$currPos++;
+        } else {
+          s7 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e6); }
+        }
+        if (s7 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f9(s1, s5);
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsearg_list() {
+    let s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parseor_expr();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse_();
+      if (input.charCodeAt(peg$currPos) === 44) {
+        s5 = peg$c7;
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e7); }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse_();
+        s7 = peg$parseor_expr();
+        if (s7 !== peg$FAILED) {
+          peg$savedPos = s3;
+          s3 = peg$f10(s1, s7);
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse_();
+        if (input.charCodeAt(peg$currPos) === 44) {
+          s5 = peg$c7;
+          peg$currPos++;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e7); }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse_();
+          s7 = peg$parseor_expr();
+          if (s7 !== peg$FAILED) {
+            peg$savedPos = s3;
+            s3 = peg$f10(s1, s7);
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f11(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsepath() {
+    let s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parseidentifier();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse_();
+      if (input.charCodeAt(peg$currPos) === 46) {
+        s5 = peg$c8;
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e8); }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse_();
+        s7 = peg$parseidentifier();
+        if (s7 !== peg$FAILED) {
+          peg$savedPos = s3;
+          s3 = peg$f12(s1, s7);
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse_();
+        if (input.charCodeAt(peg$currPos) === 46) {
+          s5 = peg$c8;
+          peg$currPos++;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e8); }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse_();
+          s7 = peg$parseidentifier();
+          if (s7 !== peg$FAILED) {
+            peg$savedPos = s3;
+            s3 = peg$f12(s1, s7);
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f13(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsearray() {
+    let s0, s1, s2, s3, s4, s5;
+
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 91) {
+      s1 = peg$c9;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e9); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      s3 = peg$parsearg_list();
+      if (s3 === peg$FAILED) {
+        s3 = null;
+      }
+      s4 = peg$parse_();
+      if (input.charCodeAt(peg$currPos) === 93) {
+        s5 = peg$c10;
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      }
+      if (s5 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f14(s3);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseobject() {
+    let s0, s1, s2, s3, s4, s5;
+
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 123) {
+      s1 = peg$c11;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e11); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      s3 = peg$parseobject_entries();
+      if (s3 === peg$FAILED) {
+        s3 = null;
+      }
+      s4 = peg$parse_();
+      if (input.charCodeAt(peg$currPos) === 125) {
+        s5 = peg$c12;
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e12); }
+      }
+      if (s5 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f15(s3);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseobject_entries() {
+    let s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = peg$currPos;
+    s1 = peg$parseobject_entry();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parse_();
+      if (input.charCodeAt(peg$currPos) === 44) {
+        s5 = peg$c7;
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e7); }
+      }
+      if (s5 !== peg$FAILED) {
+        s6 = peg$parse_();
+        s7 = peg$parseobject_entry();
+        if (s7 !== peg$FAILED) {
+          peg$savedPos = s3;
+          s3 = peg$f16(s1, s7);
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parse_();
+        if (input.charCodeAt(peg$currPos) === 44) {
+          s5 = peg$c7;
+          peg$currPos++;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e7); }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parse_();
+          s7 = peg$parseobject_entry();
+          if (s7 !== peg$FAILED) {
+            peg$savedPos = s3;
+            s3 = peg$f16(s1, s7);
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f17(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseobject_entry() {
+    let s0, s1, s2, s3, s4, s5;
+
+    s0 = peg$currPos;
+    s1 = peg$parseidentifier();
+    if (s1 === peg$FAILED) {
+      s1 = peg$parsestring_literal();
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (input.charCodeAt(peg$currPos) === 58) {
+        s3 = peg$c13;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e13); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse_();
+        s5 = peg$parseor_expr();
+        if (s5 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f18(s1, s5);
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseliteral() {
+    let s0;
+
+    s0 = peg$parsenull_literal();
+    if (s0 === peg$FAILED) {
+      s0 = peg$parseboolean_literal();
+      if (s0 === peg$FAILED) {
+        s0 = peg$parsenumber_literal();
+        if (s0 === peg$FAILED) {
+          s0 = peg$parsestring_literal_node();
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsenull_literal() {
+    let s0, s1;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 4) === peg$c14) {
+      s1 = peg$c14;
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f19();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseboolean_literal() {
+    let s0, s1;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 4) === peg$c15) {
+      s1 = peg$c15;
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e15); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f20();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      if (input.substr(peg$currPos, 5) === peg$c16) {
+        s1 = peg$c16;
+        peg$currPos += 5;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e16); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f21();
+      }
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parsenumber_literal() {
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8;
+
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 45) {
+      s3 = peg$c17;
+      peg$currPos++;
+    } else {
+      s3 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e17); }
+    }
+    if (s3 === peg$FAILED) {
+      s3 = null;
+    }
+    s4 = [];
+    s5 = input.charAt(peg$currPos);
+    if (peg$r0.test(s5)) {
+      peg$currPos++;
+    } else {
+      s5 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+    }
+    if (s5 !== peg$FAILED) {
+      while (s5 !== peg$FAILED) {
+        s4.push(s5);
+        s5 = input.charAt(peg$currPos);
+        if (peg$r0.test(s5)) {
+          peg$currPos++;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e18); }
+        }
+      }
+    } else {
+      s4 = peg$FAILED;
+    }
+    if (s4 !== peg$FAILED) {
+      s5 = peg$currPos;
+      if (input.charCodeAt(peg$currPos) === 46) {
+        s6 = peg$c8;
+        peg$currPos++;
+      } else {
+        s6 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e8); }
+      }
+      if (s6 !== peg$FAILED) {
+        s7 = [];
+        s8 = input.charAt(peg$currPos);
+        if (peg$r0.test(s8)) {
+          peg$currPos++;
+        } else {
+          s8 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e18); }
+        }
+        if (s8 !== peg$FAILED) {
+          while (s8 !== peg$FAILED) {
+            s7.push(s8);
+            s8 = input.charAt(peg$currPos);
+            if (peg$r0.test(s8)) {
+              peg$currPos++;
+            } else {
+              s8 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e18); }
+            }
+          }
+        } else {
+          s7 = peg$FAILED;
+        }
+        if (s7 !== peg$FAILED) {
+          s6 = [s6, s7];
+          s5 = s6;
+        } else {
+          peg$currPos = s5;
+          s5 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s5;
+        s5 = peg$FAILED;
+      }
+      if (s5 === peg$FAILED) {
+        s5 = null;
+      }
+      s3 = [s3, s4, s5];
+      s2 = s3;
+    } else {
+      peg$currPos = s2;
+      s2 = peg$FAILED;
+    }
+    if (s2 !== peg$FAILED) {
+      s1 = input.substring(s1, peg$currPos);
+    } else {
+      s1 = s2;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f22(s1);
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsestring_literal_node() {
+    let s0, s1;
+
+    s0 = peg$currPos;
+    s1 = peg$parsestring_literal();
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f23(s1);
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsestring_literal() {
+    let s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 34) {
+      s1 = peg$c18;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$parsedouble_char();
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$parsedouble_char();
+      }
+      if (input.charCodeAt(peg$currPos) === 34) {
+        s3 = peg$c18;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e19); }
+      }
+      if (s3 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f24(s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      if (input.charCodeAt(peg$currPos) === 39) {
+        s1 = peg$c19;
+        peg$currPos++;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = [];
+        s3 = peg$parsesingle_char();
+        while (s3 !== peg$FAILED) {
+          s2.push(s3);
+          s3 = peg$parsesingle_char();
+        }
+        if (input.charCodeAt(peg$currPos) === 39) {
+          s3 = peg$c19;
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e20); }
+        }
+        if (s3 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s0 = peg$f25(s2);
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsedouble_char() {
+    let s0, s1, s2;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c20) {
+      s1 = peg$c20;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f26();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      if (input.substr(peg$currPos, 2) === peg$c21) {
+        s1 = peg$c21;
+        peg$currPos += 2;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f27();
+      }
+      s0 = s1;
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 2) === peg$c22) {
+          s1 = peg$c22;
+          peg$currPos += 2;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e23); }
+        }
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$f28();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          if (input.substr(peg$currPos, 2) === peg$c23) {
+            s1 = peg$c23;
+            peg$currPos += 2;
+          } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e24); }
+          }
+          if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f29();
+          }
+          s0 = s1;
+          if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 2) === peg$c24) {
+              s1 = peg$c24;
+              peg$currPos += 2;
+            } else {
+              s1 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e25); }
+            }
+            if (s1 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$f30();
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+              s0 = peg$currPos;
+              s1 = peg$currPos;
+              peg$silentFails++;
+              if (input.charCodeAt(peg$currPos) === 34) {
+                s2 = peg$c18;
+                peg$currPos++;
+              } else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e19); }
+              }
+              peg$silentFails--;
+              if (s2 === peg$FAILED) {
+                s1 = undefined;
+              } else {
+                peg$currPos = s1;
+                s1 = peg$FAILED;
+              }
+              if (s1 !== peg$FAILED) {
+                if (input.length > peg$currPos) {
+                  s2 = input.charAt(peg$currPos);
+                  peg$currPos++;
+                } else {
+                  s2 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e26); }
+                }
+                if (s2 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s0 = peg$f31(s2);
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsesingle_char() {
+    let s0, s1, s2;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c20) {
+      s1 = peg$c20;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f32();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      if (input.substr(peg$currPos, 2) === peg$c21) {
+        s1 = peg$c21;
+        peg$currPos += 2;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f33();
+      }
+      s0 = s1;
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 2) === peg$c22) {
+          s1 = peg$c22;
+          peg$currPos += 2;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e23); }
+        }
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$f34();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          if (input.substr(peg$currPos, 2) === peg$c25) {
+            s1 = peg$c25;
+            peg$currPos += 2;
+          } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e27); }
+          }
+          if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f35();
+          }
+          s0 = s1;
+          if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 2) === peg$c24) {
+              s1 = peg$c24;
+              peg$currPos += 2;
+            } else {
+              s1 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e25); }
+            }
+            if (s1 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$f36();
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+              s0 = peg$currPos;
+              s1 = peg$currPos;
+              peg$silentFails++;
+              if (input.charCodeAt(peg$currPos) === 39) {
+                s2 = peg$c19;
+                peg$currPos++;
+              } else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e20); }
+              }
+              peg$silentFails--;
+              if (s2 === peg$FAILED) {
+                s1 = undefined;
+              } else {
+                peg$currPos = s1;
+                s1 = peg$FAILED;
+              }
+              if (s1 !== peg$FAILED) {
+                if (input.length > peg$currPos) {
+                  s2 = input.charAt(peg$currPos);
+                  peg$currPos++;
+                } else {
+                  s2 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e26); }
+                }
+                if (s2 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s0 = peg$f37(s2);
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseidentifier() {
+    let s0, s1, s2, s3, s4;
+
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = input.charAt(peg$currPos);
+    if (peg$r1.test(s2)) {
+      peg$currPos++;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+    }
+    if (s2 !== peg$FAILED) {
+      s3 = [];
+      s4 = input.charAt(peg$currPos);
+      if (peg$r2.test(s4)) {
+        peg$currPos++;
+      } else {
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      }
+      while (s4 !== peg$FAILED) {
+        s3.push(s4);
+        s4 = input.charAt(peg$currPos);
+        if (peg$r2.test(s4)) {
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e29); }
+        }
+      }
+      s2 = [s2, s3];
+      s1 = s2;
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+
+    return s0;
+  }
+
+  function peg$parse_() {
+    let s0, s1;
+
+    s0 = [];
+    s1 = input.charAt(peg$currPos);
+    if (peg$r3.test(s1)) {
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+    }
+    while (s1 !== peg$FAILED) {
+      s0.push(s1);
+      s1 = input.charAt(peg$currPos);
+      if (peg$r3.test(s1)) {
+        peg$currPos++;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parse__() {
+    let s0, s1;
+
+    s0 = [];
+    s1 = input.charAt(peg$currPos);
+    if (peg$r3.test(s1)) {
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+    }
+    if (s1 !== peg$FAILED) {
+      while (s1 !== peg$FAILED) {
+        s0.push(s1);
+        s1 = input.charAt(peg$currPos);
+        if (peg$r3.test(s1)) {
+          peg$currPos++;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        }
+      }
+    } else {
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+
+  function binary(op, left, right) {
+    return { kind: "binary", op, left, right };
+  }
+
+  peg$result = peg$startRuleFunction();
+
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+      peg$fail(peg$endExpectation());
+    }
+
+    throw peg$buildStructuredError(
+      peg$maxFailExpected,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
+  }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
+}
+
+module.exports = {
+  StartRules: ["start"],
+  SyntaxError: peg$SyntaxError,
+  parse: peg$parse,
+};
diff --git a/server/src/services/template-runtime/expr/expr-parser.peggy b/server/src/services/template-runtime/expr/expr-parser.peggy
new file mode 100644
index 00000000..747606fb
--- /dev/null
+++ b/server/src/services/template-runtime/expr/expr-parser.peggy
@@ -0,0 +1,120 @@
+{
+  function binary(op, left, right) {
+    return { kind: "binary", op, left, right };
+  }
+}
+
+start
+  = _ expr:or_expr _ { return expr; }
+
+or_expr
+  = head:and_expr tail:(_ "or" __ right:and_expr { return right; })* {
+      return tail.reduce((left, right) => binary("or", left, right), head);
+    }
+
+and_expr
+  = head:equality_expr tail:(_ "and" __ right:equality_expr { return right; })* {
+      return tail.reduce((left, right) => binary("and", left, right), head);
+    }
+
+equality_expr
+  = head:unary_expr tail:(_ op:("==" / "!=") _ right:unary_expr { return { op, right }; })* {
+      return tail.reduce(
+        (left, item) => binary(item.op === "==" ? "eq" : "neq", left, item.right),
+        head
+      );
+    }
+
+unary_expr
+  = "not" __ value:unary_expr { return { kind: "unary", op: "not", value }; }
+  / primary
+
+primary
+  = call
+  / literal
+  / array
+  / object
+  / path
+  / "(" _ expr:or_expr _ ")" { return expr; }
+
+call
+  = name:identifier _ "(" _ args:arg_list? _ ")" {
+      return { kind: "call", name, args: args ?? [] };
+    }
+
+arg_list
+  = head:or_expr tail:(_ "," _ value:or_expr { return value; })* {
+      return [head, ...tail];
+    }
+
+path
+  = head:identifier tail:(_ "." _ segment:identifier { return segment; })* {
+      return { kind: "path", segments: [head, ...tail] };
+    }
+
+array
+  = "[" _ items:arg_list? _ "]" {
+      return { kind: "array", items: items ?? [] };
+    }
+
+object
+  = "{" _ entries:object_entries? _ "}" {
+      return { kind: "object", entries: entries ?? [] };
+    }
+
+object_entries
+  = head:object_entry tail:(_ "," _ entry:object_entry { return entry; })* {
+      return [head, ...tail];
+    }
+
+object_entry
+  = key:(identifier / string_literal) _ ":" _ value:or_expr {
+      return { key, value };
+    }
+
+literal
+  = null_literal
+  / boolean_literal
+  / number_literal
+  / string_literal_node
+
+null_literal
+  = "null" { return { kind: "literal", value: null }; }
+
+boolean_literal
+  = "true" { return { kind: "literal", value: true }; }
+  / "false" { return { kind: "literal", value: false }; }
+
+number_literal
+  = value:$("-"? [0-9]+ ("." [0-9]+)?) {
+      return { kind: "literal", value: Number(value) };
+    }
+
+string_literal_node
+  = value:string_literal { return { kind: "literal", value }; }
+
+string_literal
+  = '"' chars:double_char* '"' { return chars.join(""); }
+  / "'" chars:single_char* "'" { return chars.join(""); }
+
+double_char
+  = "\\n" { return "\n"; }
+  / "\\r" { return "\r"; }
+  / "\\t" { return "\t"; }
+  / '\\"' { return '"'; }
+  / "\\\\" { return "\\"; }
+  / !'"' char:. { return char; }
+
+single_char
+  = "\\n" { return "\n"; }
+  / "\\r" { return "\r"; }
+  / "\\t" { return "\t"; }
+  / "\\'" { return "'"; }
+  / "\\\\" { return "\\"; }
+  / !"'" char:. { return char; }
+
+identifier
+  = $([a-zA-Z_] [a-zA-Z0-9_]*)
+
+_ = [ \t\r\n]*
+__ = [ \t\r\n]+
diff --git a/server/src/services/template-runtime/expr/parser.ts b/server/src/services/template-runtime/expr/parser.ts
new file mode 100644
index 00000000..17716d4e
--- /dev/null
+++ b/server/src/services/template-runtime/expr/parser.ts
@@ -0,0 +1,17 @@
+import { runtimeError } from "../runtime/errors";
+
+import parser from "./expr-parser";
+
+import type { ExprAst } from "../types";
+
+export function parseExpr(source: string): ExprAst {
+  try {
+    return parser.parse(source) as ExprAst;
+  } catch (error) {
+    throw runtimeError(
+      "EXPR_PARSE_ERROR",
+      error instanceof Error ? error.message : String(error),
+      { source }
+    );
+  }
+}
diff --git a/server/src/services/template-runtime/index.ts b/server/src/services/template-runtime/index.ts
new file mode 100644
index 00000000..00271064
--- /dev/null
+++ b/server/src/services/template-runtime/index.ts
@@ -0,0 +1,94 @@
+import { evaluateExprNode } from "./expr/evaluator";
+import { parseExpr } from "./expr/parser";
+import { createMacroRegistry, validateMacro } from "./macros/registry";
+import { assertNodeLimit, createExecutionState } from "./runtime/state";
+import { lowerTemplate, parseTemplate } from "./template/compiler";
+import { renderTemplateAst } from "./template/renderer";
+import { countExprNodes, countTemplateNodes } from "./types";
+
+import type {
+  ExprAst,
+  InstructionRenderContext,
+  MacroRegistry,
+  RuntimeOptions,
+  RuntimeState,
+  TemplateAst,
+} from "./types";
+
+export type {
+  DebugTrace,
+  ExprAst,
+  ExprNode,
+  InstructionRenderContext,
+  MacroDefinition,
+  MacroRegistry,
+  RuntimeError,
+  RuntimeOptions,
+  RuntimeState,
+  TemplateAst,
+  TemplateNode,
+} from "./types";
+
+export function compileExpr(source: string): ExprAst {
+  return parseExpr(source);
+}
+
+export function validateExpr(source: string): void {
+  compileExpr(source);
+}
+
+export function evaluateExpr(params: {
+  source?: string;
+  ast?: ExprAst;
+  context: InstructionRenderContext;
+  state?: RuntimeState;
+  macros?: MacroRegistry;
+  options?: RuntimeOptions;
+}): unknown {
+  const ast = params.ast ?? compileExpr(params.source ?? "");
+  const executionState = createExecutionState({
+    state: params.state,
+    options: params.options,
+    macros: params.macros,
+  });
+  assertNodeLimit(countExprNodes(ast), executionState, "expr");
+  return evaluateExprNode({
+    ast,
+    context: params.context,
+    state: executionState,
+    macros: params.macros,
+  });
+}
+
+export function compileTemplate(source: string): TemplateAst {
+  return lowerTemplate(parseTemplate(source));
+}
+
+export function validateTemplate(source: string): void {
+  compileTemplate(source);
+}
+
+export function renderTemplate(params: {
+  source?: string;
+  ast?: TemplateAst;
+  context: InstructionRenderContext;
+  state?: RuntimeState;
+  macros?: MacroRegistry;
+  options?: RuntimeOptions;
+}): string {
+  const ast = params.ast ?? compileTemplate(params.source ?? "");
+  const executionState = createExecutionState({
+    state: params.state,
+    options: params.options,
+    macros: params.macros,
+  });
+  assertNodeLimit(countTemplateNodes(ast.nodes), executionState, "template");
+  return renderTemplateAst({
+    ast,
+    context: params.context,
+    state: executionState,
+    macros: params.macros,
+  });
+}
+
+export { createMacroRegistry, validateMacro };
diff --git a/server/src/services/template-runtime/macros/macro-runtime.test.ts b/server/src/services/template-runtime/macros/macro-runtime.test.ts
new file mode 100644
index 00000000..d63c3e51
--- /dev/null
+++ b/server/src/services/template-runtime/macros/macro-runtime.test.ts
@@ -0,0 +1,163 @@
+import { describe, expect, test } from "vitest";
+
+import {
+  createMacroRegistry,
+  evaluateExpr,
+  renderTemplate,
+  type InstructionRenderContext,
+  type RuntimeError,
+} from "../index";
+
+function makeContext(): InstructionRenderContext {
+  return {
+    char: { name: "Alice" },
+    user: { name: "User" },
+    chat: { title: "Chat" },
+    messages: [{ role: "user", content: "uwu ara" }],
+    rag: {},
+    art: {},
+    lastUserMessage: "uwu ara",
+    now: new Date("2026-03-16T00:00:00.000Z").toISOString(),
+  };
+}
+
+describe("template-runtime/macros", () => {
+  test("invokes value and template macros with named params", () => {
+    const macros = createMacroRegistry([
+      {
+        name: "detectFlags",
+        kind: "value",
+        params: [{ name: "text", required: true }],
+        body: '{ uwu: contains(text, "uwu", "i"), ara: contains(text, "ara", "i") }',
+      },
+      {
+        name: "sceneHeader",
+        kind: "template",
+        params: [
+          { name: "char", required: true },
+          { name: "user", required: true },
+        ],
+        body: "Character={{char.name}}|User={{user.name}}",
+      },
+    ]);
+
+    expect(
+      evaluateExpr({
+        source: 'call("detectFlags", { text: lastUserMessage })',
+        context: makeContext(),
+        macros,
+      })
+    ).toEqual({
+      uwu: true,
+      ara: true,
+    });
+
+    expect(
+      renderTemplate({
+        source: '{{ use("sceneHeader", { char: char, user: user }) }}',
+        context: makeContext(),
+        macros,
+      })
+    ).toBe("Character=Alice|User=User");
+  });
+
+  test("supports required and default params", () => {
+    const macros = createMacroRegistry([
+      {
+        name: "greeting",
+        kind: "template",
+        params: [
+          { name: "name", required: false, defaultExpr: '"Guest"' },
+        ],
+        body: "Hello {{name}}",
+      },
+    ]);
+
+    expect(
+      renderTemplate({
+        source: '{{ use("greeting", {}) }}',
+        context: makeContext(),
+        macros,
+      })
+    ).toBe("Hello Guest");
+
+    expect(() =>
+      renderTemplate({
+        source: '{{ use("missingMacro", {}) }}',
+        context: makeContext(),
+        macros,
+      })
+    ).toThrow();
+  });
+
+  test("creates fresh local scopes and allows nested macro calls", () => {
+    const macros = createMacroRegistry([
+      {
+        name: "inner",
+        kind: "template",
+        params: [{ name: "name", required: true }],
+        body: '{{set("name", "Inner", "local")}}<{{name}}>',
+      },
+      {
+        name: "outer",
+        kind: "template",
+        params: [{ name: "name", required: true }],
+        body: '{{name}}-{{ use("inner", { name: name }) }}-{{name}}',
+      },
+    ]);
+
+    expect(
+      renderTemplate({
+        source: '{{ use("outer", { name: "Outer" }) }}',
+        context: makeContext(),
+        macros,
+      })
+    ).toBe("Outer-<Inner>-Outer");
+  });
+
+  test("detects direct and indirect cycles", () => {
+    const direct = createMacroRegistry([
+      {
+        name: "loop",
+        kind: "template",
+        params: [],
+        body: '{{ use("loop", {}) }}',
+      },
+    ]);
+
+    expect(() =>
+      renderTemplate({
+        source: '{{ use("loop", {}) }}',
+        context: makeContext(),
+        macros: direct,
+      })
+    ).toThrow();
+
+    const indirect = createMacroRegistry([
+      {
+        name: "a",
+        kind: "template",
+        params: [],
+        body: '{{ use("b", {}) }}',
+      },
+      {
+        name: "b",
+        kind: "template",
+        params: [],
+        body: '{{ use("a", {}) }}',
+      },
+    ]);
+
+    try {
+      renderTemplate({
+        source: '{{ use("a", {}) }}',
+        context: makeContext(),
+        macros: indirect,
+      });
+      throw new Error("expected cycle error");
+    } catch (error) {
+      const runtimeError = error as RuntimeError;
+      expect(runtimeError.code).toBe("MACRO_CYCLE");
+    }
+  });
+});
diff --git a/server/src/services/template-runtime/macros/registry.ts b/server/src/services/template-runtime/macros/registry.ts
new file mode 100644
index 00000000..4e3c5499
--- /dev/null
+++ b/server/src/services/template-runtime/macros/registry.ts
@@ -0,0 +1,75 @@
+import { parseExpr } from "../expr/parser";
+import { runtimeError } from "../runtime/errors";
+import { lowerTemplate, parseTemplate } from "../template/compiler";
+
+import type { CompiledMacroDefinition, MacroDefinition, MacroRegistry } from "../types";
+
+export function validateMacro(definition: MacroDefinition): void {
+  if (!definition.name || definition.name.trim().length === 0) {
+    throw runtimeError("INVALID_MACRO", "Macro name is required");
+  }
+  if (definition.kind !== "value" && definition.kind !== "template") {
+    throw runtimeError("INVALID_MACRO", `Unsupported macro kind: ${definition.kind}`);
+  }
+
+  const seen = new Set<string>();
+  for (const param of definition.params) {
+    if (!param.name || param.name.trim().length === 0) {
+      throw runtimeError("INVALID_MACRO", "Macro param name is required", { macro: definition.name });
+    }
+    if (seen.has(param.name)) {
+      throw runtimeError("INVALID_MACRO", `Duplicate macro param: ${param.name}`, {
+        macro: definition.name,
+      });
+    }
+    seen.add(param.name);
+  }
+}
+
+export function createMacroRegistry(definitions: MacroDefinition[] = []): MacroRegistry {
+  const source = new Map<string, MacroDefinition>();
+  const compiled = new Map<string, CompiledMacroDefinition>();
+
+  for (const definition of definitions) {
+    validateMacro(definition);
+    if (source.has(definition.name)) {
+      throw runtimeError("INVALID_MACRO", `Duplicate macro name: ${definition.name}`, {
+        macro: definition.name,
+      });
+    }
+    source.set(definition.name, {
+      ...definition,
+      engine: "native_v1",
+    });
+  }
+
+  return {
+    definitions: source,
+    get(name: string) {
+      return source.get(name);
+    },
+    getCompiled(name: string) {
+      const existing = compiled.get(name);
+      if (existing) return existing;
+      const definition = source.get(name);
+      if (!definition) return undefined;
+
+      const built =
+        definition.kind === "value"
+          ? {
+              name: definition.name,
+              kind: "value" as const,
+              params: definition.params,
+              body: parseExpr(definition.body),
+            }
+          : {
+              name: definition.name,
+              kind: "template" as const,
+              params: definition.params,
+              body: lowerTemplate(parseTemplate(definition.body)),
+            };
+      compiled.set(name, built);
+      return built;
+    },
+  };
+}
diff --git a/server/src/services/template-runtime/runtime/errors.ts b/server/src/services/template-runtime/runtime/errors.ts
new file mode 100644
index 00000000..6a7a8687
--- /dev/null
+++ b/server/src/services/template-runtime/runtime/errors.ts
@@ -0,0 +1,9 @@
+import { RuntimeError, type RuntimeErrorCode } from "../types";
+
+export function runtimeError(
+  code: RuntimeErrorCode,
+  message: string,
+  details?: Record<string, unknown>
+): RuntimeError {
+  return new RuntimeError(code, message, details);
+}
diff --git a/server/src/services/template-runtime/runtime/helpers.ts b/server/src/services/template-runtime/runtime/helpers.ts
new file mode 100644
index 00000000..d391905b
--- /dev/null
+++ b/server/src/services/template-runtime/runtime/helpers.ts
@@ -0,0 +1,136 @@
+import { runtimeError } from "./errors";
+
+import type { HelperDefinition, HelperInvocation } from "../types";
+
+function asString(value: unknown): string {
+  if (typeof value === "string") return value;
+  if (value === null || typeof value === "undefined") return "";
+  return String(value);
+}
+
+function asPositiveInteger(value: unknown): number | null {
+  const raw = typeof value === "string" && value.trim().length > 0 ? Number(value) : value;
+  if (typeof raw !== "number" || !Number.isFinite(raw)) return null;
+  const normalized = Math.floor(raw);
+  return normalized > 0 ? normalized : null;
+}
+
+function approxTokensByChars(chars: number): number {
+  return chars <= 0 ? 0 : Math.ceil(Math.floor(chars) / 4);
+}
+
+function conversationalMessages(messages: Array<{ role: string; content: string }>) {
+  return messages.filter((message) => message.role === "user" || message.role === "assistant");
+}
+
+function recentMessagesByTokenLimit(
+  messages: Array<{ role: string; content: string }>,
+  tokenLimit: number
+): Array<{ role: string; content: string }> {
+  if (tokenLimit <= 0) return [];
+  const selected: Array<{ role: string; content: string }> = [];
+  let total = 0;
+
+  for (let idx = messages.length - 1; idx >= 0; idx -= 1) {
+    const message = messages[idx];
+    if (!message) continue;
+    selected.push(message);
+    total += approxTokensByChars(message.content.length);
+    if (total >= tokenLimit) break;
+  }
+
+  selected.reverse();
+  return selected;
+}
+
+function formatMessages(messages: Array<{ role: string; content: string }>): string {
+  return messages.map((message) => `${message.role}: ${message.content}`).join("\n");
+}
+
+function clampRng(value: number): number {
+  if (!Number.isFinite(value) || value <= 0) return 0;
+  if (value >= 1) return 0.999_999_999_999;
+  return value;
+}
+
+const helpers: Record<string, HelperDefinition> = {
+  contains: ({ args }) => {
+    const [text, needle, flags] = args;
+    const haystack = asString(text);
+    const rawNeedle = asString(needle);
+    if (rawNeedle.length === 0) return false;
+    if (typeof flags === "string" && flags.length > 0) {
+      return new RegExp(rawNeedle, flags).test(haystack);
+    }
+    return haystack.includes(rawNeedle);
+  },
+  match: ({ args }) => {
+    const [text, pattern, flags] = args;
+    return new RegExp(asString(pattern), typeof flags === "string" ? flags : "").test(
+      asString(text)
+    );
+  },
+  lower: ({ args }) => asString(args[0]).toLowerCase(),
+  upper: ({ args }) => asString(args[0]).toUpperCase(),
+  trimText: ({ args }) => asString(args[0]).trim(),
+  size: ({ args }) => {
+    const value = args[0];
+    if (Array.isArray(value) || typeof value === "string") return value.length;
+    if (value && typeof value === "object") return Object.keys(value).length;
+    return 0;
+  },
+  empty: ({ args }) => {
+    const value = args[0];
+    if (value === null || typeof value === "undefined") return true;
+    if (typeof value === "string") return value.length === 0;
+    if (Array.isArray(value)) return value.length === 0;
+    if (typeof value === "object") return Object.keys(value).length === 0;
+    return false;
+  },
+  coalesce: ({ args }) => args.find((value) => value !== null && typeof value !== "undefined") ?? null,
+  json: ({ args }) => JSON.stringify(args[0]),
+  outlet: ({ args, context }) => {
+    const key = asString(args[0]);
+    return context.outlet?.[key] ?? "";
+  },
+  pickRandom: ({ args, options }) => {
+    if (args.length === 0) return null;
+    const idx = Math.floor(clampRng(options.rng()) * args.length);
+    return args[idx] ?? args[0] ?? null;
+  },
+  recentMessages: ({ args, context }) => {
+    const count = asPositiveInteger(args[0]);
+    if (!count) return [];
+    return conversationalMessages(context.messages).slice(-count);
+  },
+  recentMessagesText: ({ args, context }) => {
+    const count = asPositiveInteger(args[0]);
+    if (!count) return "";
+    return formatMessages(conversationalMessages(context.messages).slice(-count));
+  },
+  recentMessagesByContextTokens: ({ args, context }) => {
+    const limit = asPositiveInteger(args[0]);
+    if (!limit) return [];
+    return recentMessagesByTokenLimit(conversationalMessages(context.messages), limit);
+  },
+  recentMessagesByContextTokensText: ({ args, context }) => {
+    const limit = asPositiveInteger(args[0]);
+    if (!limit) return "";
+    return formatMessages(recentMessagesByTokenLimit(conversationalMessages(context.messages), limit));
+  },
+};
+
+export function invokeHelper(name: string, input: HelperInvocation): unknown {
+  const helper = helpers[name];
+  if (!helper) {
+    throw runtimeError("UNKNOWN_HELPER", `Unknown helper: ${name}`, { helper: name });
+  }
+  try {
+    return helper(input);
+  } catch (error) {
+    if (error instanceof Error && "code" in error) throw error;
+    throw runtimeError("HELPER_ERROR", error instanceof Error ? error.message : String(error), {
+      helper: name,
+    });
+  }
+}
diff --git a/server/src/services/template-runtime/runtime/limits-and-integration.test.ts b/server/src/services/template-runtime/runtime/limits-and-integration.test.ts
new file mode 100644
index 00000000..6a3dad26
--- /dev/null
+++ b/server/src/services/template-runtime/runtime/limits-and-integration.test.ts
@@ -0,0 +1,130 @@
+import { describe, expect, test } from "vitest";
+
+import { createMacroRegistry, evaluateExpr, renderTemplate, type InstructionRenderContext, type RuntimeError } from "../index";
+
+function makeContext(): InstructionRenderContext {
+  return {
+    char: { name: "Alice", title: "Captain" },
+    user: { name: "User" },
+    chat: { title: "Chat" },
+    messages: [
+      { role: "assistant", content: "A1" },
+      { role: "user", content: "U1 uwu" },
+      { role: "assistant", content: "A2 ara" },
+      { role: "user", content: "U2 uwu ara" },
+    ],
+    rag: {},
+    art: {
+      note: { value: "NOTE", history: ["NOTE"] },
+    },
+    promptSystem: "SYS",
+    outlet: {
+      default: "OUTLET_TEXT",
+    },
+    lastUserMessage: "U2 uwu ara",
+    lastAssistantMessage: "A2 ara",
+    now: new Date("2026-03-16T00:00:00.000Z").toISOString(),
+  };
+}
+
+describe("template-runtime/limits-and-integration", () => {
+  test("builds deterministic flags object from lastUserMessage", () => {
+    expect(
+      evaluateExpr({
+        source: '{ uwu: contains(lastUserMessage, "uwu", "i"), ara: contains(lastUserMessage, "ara", "i") }',
+        context: makeContext(),
+      })
+    ).toEqual({
+      uwu: true,
+      ara: true,
+    });
+  });
+
+  test("renders prompt-like output with current prompt fields", () => {
+    expect(
+      renderTemplate({
+        source: "System={{promptSystem}}\nCharacter={{char.name}}\nLastUser={{lastUserMessage}}\nArtifact={{art.note.value}}",
+        context: makeContext(),
+      })
+    ).toBe("System=SYS\nCharacter=Alice\nLastUser=U2 uwu ara\nArtifact=NOTE");
+  });
+
+  test("supports ST-heavy templates and baseline helper semantics", () => {
+    expect(
+      renderTemplate({
+        source:
+          "U={{lastUserMessage}}\nA={{lastAssistantMessage}}\nO={{outlet::default}}\n{{trim}}\n{{recentMessagesText(2)}}",
+        context: makeContext(),
+      })
+    ).toBe(
+      "U=U2 uwu ara\nA=A2 ara\nO=OUTLET_TEXT\nassistant: A2 ara\nuser: U2 uwu ara"
+    );
+  });
+
+  test("enforces max output chars and max macro depth", () => {
+    expect(() =>
+      renderTemplate({
+        source: "abcdef",
+        context: makeContext(),
+        options: {
+          maxOutputChars: 3,
+        },
+      })
+    ).toThrow();
+
+    const macros = createMacroRegistry([
+      {
+        name: "depth1",
+        kind: "template",
+        params: [],
+        body: '{{ use("depth2", {}) }}',
+      },
+      {
+        name: "depth2",
+        kind: "template",
+        params: [],
+        body: '{{ use("depth3", {}) }}',
+      },
+      {
+        name: "depth3",
+        kind: "template",
+        params: [],
+        body: "ok",
+      },
+    ]);
+
+    expect(() =>
+      renderTemplate({
+        source: '{{ use("depth1", {}) }}',
+        context: makeContext(),
+        macros,
+        options: {
+          maxMacroDepth: 1,
+        },
+      })
+    ).toThrow();
+  });
+
+  test("enforces execution-step limits and helper validation errors", () => {
+    expect(() =>
+      renderTemplate({
+        source: "{{#each [1,2,3,4] as item}}[{{item}}]{{/each}}",
+        context: makeContext(),
+        options: {
+          maxExecutionSteps: 3,
+        },
+      })
+    ).toThrow();
+
+    try {
+      evaluateExpr({
+        source: 'match(lastUserMessage, "[", "i")',
+        context: makeContext(),
+      });
+      throw new Error("expected helper error");
+    } catch (error) {
+      const runtimeError = error as RuntimeError;
+      expect(runtimeError.code).toBe("HELPER_ERROR");
+    }
+  });
+});
diff --git a/server/src/services/template-runtime/runtime/path.ts b/server/src/services/template-runtime/runtime/path.ts
new file mode 100644
index 00000000..5a221ae1
--- /dev/null
+++ b/server/src/services/template-runtime/runtime/path.ts
@@ -0,0 +1,43 @@
+import { runtimeError } from "./errors";
+import { readScopedValue } from "./state";
+
+import type { ExecutionState } from "./state";
+import type { InstructionRenderContext } from "../types";
+
+function hasOwn(value: object, key: string): boolean {
+  return Object.prototype.hasOwnProperty.call(value, key);
+}
+
+export function resolvePathValue(params: {
+  segments: string[];
+  context: InstructionRenderContext;
+  state: ExecutionState;
+}): unknown {
+  const [head, ...tail] = params.segments;
+  let current: unknown = readScopedValue(params.state, head);
+
+  if (typeof current === "undefined") {
+    current = (params.context as unknown as Record<string, unknown>)[head];
+  }
+
+  if (typeof current === "undefined") {
+    if (params.state.options.strictVariables) {
+      throw runtimeError("MISSING_VARIABLE", `Unknown variable: ${head}`, { path: params.segments });
+    }
+    return null;
+  }
+
+  for (const segment of tail) {
+    if (current === null || typeof current !== "object" || !hasOwn(current, segment)) {
+      if (params.state.options.strictVariables) {
+        throw runtimeError("MISSING_VARIABLE", `Unknown path: ${params.segments.join(".")}`, {
+          path: params.segments,
+        });
+      }
+      return null;
+    }
+    current = (current as Record<string, unknown>)[segment];
+  }
+
+  return typeof current === "undefined" ? null : current;
+}
diff --git a/server/src/services/template-runtime/runtime/state.ts b/server/src/services/template-runtime/runtime/state.ts
new file mode 100644
index 00000000..1c4207fe
--- /dev/null
+++ b/server/src/services/template-runtime/runtime/state.ts
@@ -0,0 +1,184 @@
+import { runtimeError } from "./errors";
+
+import type { DebugTrace, MacroRegistry, RuntimeOptions, RuntimeState, StatementScope } from "../types";
+
+const DEFAULT_OPTIONS = {
+  strictVariables: false,
+  maxMacroDepth: 8,
+  maxExecutionSteps: 2_000,
+  maxOutputChars: 200_000,
+  maxObjectNesting: 16,
+  maxAstNodes: 2_000,
+} as const;
+
+export type NormalizedRuntimeOptions = Required<
+  Pick<
+    RuntimeOptions,
+    | "strictVariables"
+    | "maxMacroDepth"
+    | "maxExecutionSteps"
+    | "maxOutputChars"
+    | "maxObjectNesting"
+    | "maxAstNodes"
+  >
+> & {
+  rng: () => number;
+  debugTrace?: DebugTrace;
+};
+
+export type ExecutionState = {
+  localScopes: Array<Record<string, unknown>>;
+  renderScope: Record<string, unknown>;
+  turnScope: Record<string, unknown>;
+  sessionScope?: Record<string, unknown>;
+  steps: number;
+  macroStack: string[];
+  trimSentinelUsed: boolean;
+  macros?: MacroRegistry;
+  options: NormalizedRuntimeOptions;
+};
+
+export const TRIM_SENTINEL = "__TS_NATIVE_TEMPLATE_TRIM__";
+
+export function normalizeRuntimeOptions(options?: RuntimeOptions): NormalizedRuntimeOptions {
+  return {
+    ...DEFAULT_OPTIONS,
+    ...options,
+    rng: options?.rng ?? Math.random,
+  };
+}
+
+export function createExecutionState(params: {
+  state?: RuntimeState;
+  options?: RuntimeOptions;
+  macros?: MacroRegistry;
+}): ExecutionState {
+  return {
+    localScopes: [structuredClone(params.state?.scopes.local ?? {})],
+    renderScope: structuredClone(params.state?.scopes.render ?? {}),
+    turnScope: structuredClone(params.state?.scopes.turn ?? {}),
+    sessionScope: params.state?.scopes.session
+      ? structuredClone(params.state.scopes.session)
+      : undefined,
+    steps: 0,
+    macroStack: [],
+    trimSentinelUsed: false,
+    macros: params.macros,
+    options: normalizeRuntimeOptions(params.options),
+  };
+}
+
+export function snapshotRuntimeState(state: ExecutionState): RuntimeState {
+  return {
+    scopes: {
+      local: structuredClone(state.localScopes[state.localScopes.length - 1] ?? {}),
+      render: structuredClone(state.renderScope),
+      turn: structuredClone(state.turnScope),
+      ...(state.sessionScope ? { session: structuredClone(state.sessionScope) } : {}),
+    },
+  };
+}
+
+export function pushLocalScope(state: ExecutionState, values?: Record<string, unknown>): void {
+  const next = {
+    ...(state.localScopes[state.localScopes.length - 1] ?? {}),
+    ...(values ?? {}),
+  };
+  state.localScopes.push(next);
+}
+
+export function popLocalScope(state: ExecutionState): void {
+  if (state.localScopes.length > 1) state.localScopes.pop();
+}
+
+export function readScopedValue(state: ExecutionState, key: string): unknown {
+  const local = state.localScopes[state.localScopes.length - 1];
+  if (local && key in local) return local[key];
+  if (key in state.renderScope) return state.renderScope[key];
+  if (key in state.turnScope) return state.turnScope[key];
+  if (state.sessionScope && key in state.sessionScope) return state.sessionScope[key];
+  return undefined;
+}
+
+export function writeScopedValue(
+  state: ExecutionState,
+  scope: StatementScope,
+  key: string,
+  value: unknown
+): void {
+  if (scope === "session") {
+    throw runtimeError("INVALID_SCOPE", "session scope is reserved and disabled in v1", {
+      scope,
+      key,
+    });
+  }
+
+  if (scope === "local") {
+    state.localScopes[state.localScopes.length - 1][key] = value;
+    return;
+  }
+  if (scope === "render") {
+    state.renderScope[key] = value;
+    return;
+  }
+  state.turnScope[key] = value;
+}
+
+export function unsetScopedValue(state: ExecutionState, scope: StatementScope, key: string): void {
+  if (scope === "session") {
+    throw runtimeError("INVALID_SCOPE", "session scope is reserved and disabled in v1", {
+      scope,
+      key,
+    });
+  }
+
+  if (scope === "local") {
+    delete state.localScopes[state.localScopes.length - 1]?.[key];
+    return;
+  }
+  if (scope === "render") {
+    delete state.renderScope[key];
+    return;
+  }
+  delete state.turnScope[key];
+}
+
+export function step(state: ExecutionState, label: string): void {
+  state.steps += 1;
+  state.options.debugTrace?.execution?.push(label);
+  if (state.steps > state.options.maxExecutionSteps) {
+    throw runtimeError("LIMIT_EXCEEDED", "runtime exceeded maxExecutionSteps", {
+      maxExecutionSteps: state.options.maxExecutionSteps,
+      label,
+    });
+  }
+}
+
+export function assertNodeLimit(count: number, state: ExecutionState, label: string): void {
+  if (count > state.options.maxAstNodes) {
+    throw runtimeError("LIMIT_EXCEEDED", `runtime exceeded maxAstNodes in ${label}`, {
+      count,
+      maxAstNodes: state.options.maxAstNodes,
+    });
+  }
+}
+
+export function pushMacro(state: ExecutionState, macroName: string): void {
+  if (state.macroStack.includes(macroName)) {
+    throw runtimeError("MACRO_CYCLE", `macro cycle detected for ${macroName}`, {
+      macroName,
+      stack: [...state.macroStack],
+    });
+  }
+  if (state.macroStack.length >= state.options.maxMacroDepth) {
+    throw runtimeError("LIMIT_EXCEEDED", "runtime exceeded maxMacroDepth", {
+      maxMacroDepth: state.options.maxMacroDepth,
+      macroName,
+    });
+  }
+  state.macroStack.push(macroName);
+}
+
+export function popMacro(state: ExecutionState): void {
+  state.macroStack.pop();
+}
diff --git a/server/src/services/template-runtime/template/compile-template.test.ts b/server/src/services/template-runtime/template/compile-template.test.ts
new file mode 100644
index 00000000..8397b1a4
--- /dev/null
+++ b/server/src/services/template-runtime/template/compile-template.test.ts
@@ -0,0 +1,74 @@
+import { describe, expect, test } from "vitest";
+
+import { compileTemplate, validateTemplate, type RuntimeError } from "../index";
+
+describe("template-runtime/compileTemplate", () => {
+  test("parses text, output, if, and each blocks", () => {
+    expect(compileTemplate("Hello {{ char.name }}")).toMatchObject({
+      kind: "template",
+      nodes: [
+        { kind: "text", value: "Hello " },
+        { kind: "output", expr: { kind: "path", segments: ["char", "name"] } },
+      ],
+    });
+
+    expect(
+      compileTemplate(
+        "{{#if contains(lastUserMessage, \"uwu\", \"i\")}}UWU{{else}}NONE{{/if}}{{#each messages as msg}}[{{msg.role}}]{{/each}}"
+      )
+    ).toMatchObject({
+      kind: "template",
+      nodes: [
+        {
+          kind: "if",
+          then: [{ kind: "text", value: "UWU" }],
+          else: [{ kind: "text", value: "NONE" }],
+        },
+        {
+          kind: "each",
+          itemName: "msg",
+        },
+      ],
+    });
+  });
+
+  test("lowers ST aliases into canonical nodes", () => {
+    const ast = compileTemplate("A{{trim}}B{{outlet::default}}{{random::A::B}}{{setvar::mood::angry}}");
+
+    expect(ast).toMatchObject({
+      kind: "template",
+      nodes: [
+        { kind: "text", value: "A" },
+        { kind: "statement", statement: { kind: "trim" } },
+        { kind: "text", value: "B" },
+        { kind: "output", expr: { kind: "call", name: "outlet" } },
+        { kind: "output", expr: { kind: "call", name: "pickRandom" } },
+        {
+          kind: "statement",
+          statement: {
+            kind: "set",
+            scope: "render",
+            name: "mood",
+            value: { kind: "literal", value: "angry" },
+          },
+        },
+      ],
+    });
+  });
+
+  test("validateTemplate accepts valid templates and rejects invalid ones", () => {
+    expect(() => validateTemplate("Hello {{ char.name }}")).not.toThrow();
+    expect(() => validateTemplate("{{#if true}}ok{{/if}}")).not.toThrow();
+    expect(() => validateTemplate("{{#if true}}")).toThrow();
+  });
+
+  test("rejects unknown ST alias syntax", () => {
+    try {
+      compileTemplate("{{unknown::value}}");
+      throw new Error("expected alias error");
+    } catch (error) {
+      const runtimeError = error as RuntimeError;
+      expect(runtimeError.code).toBe("UNKNOWN_ST_ALIAS");
+    }
+  });
+});
diff --git a/server/src/services/template-runtime/template/compiler.ts b/server/src/services/template-runtime/template/compiler.ts
new file mode 100644
index 00000000..c578d44c
--- /dev/null
+++ b/server/src/services/template-runtime/template/compiler.ts
@@ -0,0 +1,167 @@
+import { parseExpr } from "../expr/parser";
+import { runtimeError } from "../runtime/errors";
+
+import parser from "./template-parser";
+
+import type {
+  ExprNode,
+  RawTemplateAst,
+  RawTemplateNode,
+  StatementScope,
+  TemplateAst,
+  TemplateNode,
+} from "../types";
+
+const ST_ALIAS_PREFIX_RE = /^[a-zA-Z_][a-zA-Z0-9_]*::/;
+const EACH_SOURCE_RE = /^(.*)\bas\s+([a-zA-Z_][a-zA-Z0-9_]*)$/s;
+
+export function parseTemplate(source: string): RawTemplateAst {
+  try {
+    return parser.parse(source) as RawTemplateAst;
+  } catch (error) {
+    throw runtimeError(
+      "TEMPLATE_PARSE_ERROR",
+      error instanceof Error ? error.message : String(error),
+      { source }
+    );
+  }
+}
+
+export function lowerTemplate(raw: RawTemplateAst): TemplateAst {
+  return {
+    kind: "template",
+    nodes: raw.nodes.map(lowerNode),
+  };
+}
+
+function lowerNode(node: RawTemplateNode): TemplateNode {
+  switch (node.kind) {
+    case "text":
+      return node;
+    case "raw_output":
+      return lowerOutput(node.source);
+    case "raw_if":
+      return {
+        kind: "if",
+        condition: parseExpr(node.condition),
+        then: node.then.map(lowerNode),
+        else: node.else.map(lowerNode),
+      };
+    case "raw_each": {
+      const match = node.source.match(EACH_SOURCE_RE);
+      if (!match) {
+        throw runtimeError("TEMPLATE_PARSE_ERROR", `Invalid each syntax: ${node.source}`);
+      }
+      const [, source, itemName] = match;
+      return {
+        kind: "each",
+        source: parseExpr(source.trim()),
+        itemName,
+        body: node.body.map(lowerNode),
+      };
+    }
+  }
+}
+
+function lowerOutput(source: string): TemplateNode {
+  const trimmed = source.trim();
+  if (trimmed === "trim") {
+    return {
+      kind: "statement",
+      statement: { kind: "trim" },
+    };
+  }
+  if (trimmed.startsWith("outlet::")) {
+    return outputCall("outlet", [literal(trimmed.slice("outlet::".length))]);
+  }
+  if (trimmed.startsWith("random::")) {
+    const values = trimmed
+      .slice("random::".length)
+      .split("::")
+      .map((value) => value.trim())
+      .filter((value) => value.length > 0)
+      .map(literal);
+    return outputCall("pickRandom", values);
+  }
+  if (trimmed.startsWith("setvar::")) {
+    const payload = trimmed.slice("setvar::".length).split("::");
+    if (payload.length < 2) {
+      throw runtimeError("UNKNOWN_ST_ALIAS", `Unsupported ST alias: ${trimmed}`);
+    }
+    const [name, ...rawValue] = payload;
+    return {
+      kind: "statement",
+      statement: {
+        kind: "set",
+        scope: "render",
+        name,
+        value: literal(rawValue.join("::")),
+      },
+    };
+  }
+  if (ST_ALIAS_PREFIX_RE.test(trimmed)) {
+    throw runtimeError("UNKNOWN_ST_ALIAS", `Unsupported ST alias: ${trimmed}`);
+  }
+
+  const expr = parseExpr(trimmed);
+  return maybeLowerStatement(expr);
+}
+
+function maybeLowerStatement(expr: ExprNode): TemplateNode {
+  if (expr.kind !== "call") return { kind: "output", expr };
+  if (expr.name === "set") {
+    const [nameNode, valueNode, scopeNode] = expr.args;
+    return {
+      kind: "statement",
+      statement: {
+        kind: "set",
+        scope: resolveScope(scopeNode),
+        name: readLiteralString(nameNode, "set"),
+        value: valueNode ?? literal(null),
+      },
+    };
+  }
+  if (expr.name === "unset") {
+    const [nameNode, scopeNode] = expr.args;
+    return {
+      kind: "statement",
+      statement: {
+        kind: "unset",
+        scope: resolveScope(scopeNode),
+        name: readLiteralString(nameNode, "unset"),
+      },
+    };
+  }
+  return { kind: "output", expr };
+}
+
+function resolveScope(node: ExprNode | undefined): StatementScope {
+  if (!node) return "render";
+  const scope = readLiteralString(node, "scope");
+  if (scope === "local" || scope === "render" || scope === "turn" || scope === "session") {
+    return scope;
+  }
+  throw runtimeError("INVALID_SCOPE", `Unsupported scope: ${scope}`, { scope });
+}
+
+function readLiteralString(node: ExprNode | undefined, label: string): string {
+  if (!node || node.kind !== "literal" || typeof node.value !== "string") {
+    throw runtimeError("TEMPLATE_PARSE_ERROR", `${label} requires string literal argument`);
+  }
+  return node.value;
+}
+
+function literal(value: null | boolean | number | string): ExprNode {
+  return { kind: "literal", value };
+}
+
+function outputCall(name: string, args: ExprNode[]): TemplateNode {
+  return {
+    kind: "output",
+    expr: {
+      kind: "call",
+      name,
+      args,
+    },
+  };
+}
diff --git a/server/src/services/template-runtime/template/render-template.test.ts b/server/src/services/template-runtime/template/render-template.test.ts
new file mode 100644
index 00000000..fe095576
--- /dev/null
+++ b/server/src/services/template-runtime/template/render-template.test.ts
@@ -0,0 +1,110 @@
+import { describe, expect, test } from "vitest";
+
+import { renderTemplate, type InstructionRenderContext } from "../index";
+
+function makeContext(): InstructionRenderContext {
+  return {
+    char: { name: "Alice" },
+    user: { name: "User" },
+    chat: { title: "Chat" },
+    messages: [
+      { role: "assistant", content: "A1" },
+      { role: "user", content: "U1 uwu" },
+      { role: "assistant", content: "A2 ara" },
+      { role: "user", content: "U2 uwu ara" },
+    ],
+    rag: {},
+    art: {
+      note: { value: "NOTE", history: ["NOTE"] },
+    },
+    promptSystem: "SYS",
+    outlet: {
+      default: "OUTLET_TEXT",
+    },
+    lastUserMessage: "U2 uwu ara",
+    lastAssistantMessage: "A2 ara",
+    now: new Date("2026-03-16T00:00:00.000Z").toISOString(),
+  };
+}
+
+describe("template-runtime/renderTemplate", () => {
+  test("renders text interpolation, if/else, and each", () => {
+    const rendered = renderTemplate({
+      source:
+        "Hi {{ char.name }}\n{{#if contains(lastUserMessage, \"uwu\", \"i\")}}YES{{else}}NO{{/if}}\n{{#each messages as msg}}[{{msg.role}}={{msg.content}}]{{/each}}",
+      context: makeContext(),
+    });
+
+    expect(rendered).toBe(
+      "Hi Alice\nYES\n[assistant=A1][user=U1 uwu][assistant=A2 ara][user=U2 uwu ara]"
+    );
+  });
+
+  test("supports set and unset statements with render scope default", () => {
+    const rendered = renderTemplate({
+      source:
+        "{{set(\"mood\", \"angry\")}}Mood={{mood}}|{{unset(\"mood\")}}After={{mood}}",
+      context: makeContext(),
+    });
+
+    expect(rendered).toBe("Mood=angry|After=");
+  });
+
+  test("supports trim semantics around blank lines", () => {
+    const rendered = renderTemplate({
+      source: "Start\n\n{{ wiBefore }}\n{{trim}}\n\n{{ wiAfter }}\n\nEnd",
+      context: {
+        ...makeContext(),
+        wiBefore: "BEFORE",
+        wiAfter: "AFTER",
+      },
+    });
+
+    expect(rendered).toBe("Start\n\nBEFORE\nAFTER\n\nEnd");
+  });
+
+  test("supports mixed canonical syntax and ST aliases", () => {
+    const rendered = renderTemplate({
+      source:
+        "{{set(\"tone\", pickRandom(\"calm\", \"tense\"))}}T={{tone}}|O={{outlet::default}}|R={{random::A::B}}|{{setvar::mood::angry}}M={{mood}}",
+      context: makeContext(),
+      options: {
+        rng: () => 0,
+      },
+    });
+
+    expect(rendered).toBe("T=calm|O=OUTLET_TEXT|R=A|M=angry");
+  });
+
+  test("coerces missing values to empty string in non-strict mode and errors in strict mode", () => {
+    expect(
+      renderTemplate({
+        source: "X={{missing.value}}",
+        context: makeContext(),
+      })
+    ).toBe("X=");
+
+    expect(() =>
+      renderTemplate({
+        source: "X={{missing.value}}",
+        context: makeContext(),
+        options: {
+          strictVariables: true,
+        },
+      })
+    ).toThrow();
+  });
+
+  test("does not mutate input context or state", () => {
+    const context = makeContext();
+    const messagesBefore = [...context.messages];
+    const rendered = renderTemplate({
+      source: "{{set(\"mood\", \"angry\")}}{{mood}}",
+      context,
+    });
+
+    expect(rendered).toBe("angry");
+    expect(context.messages).toEqual(messagesBefore);
+    expect((context as unknown as Record<string, unknown>).mood).toBeUndefined();
+  });
+});
diff --git a/server/src/services/template-runtime/template/renderer.ts b/server/src/services/template-runtime/template/renderer.ts
new file mode 100644
index 00000000..55cb2359
--- /dev/null
+++ b/server/src/services/template-runtime/template/renderer.ts
@@ -0,0 +1,234 @@
+import { evaluateExprNode } from "../expr/evaluator";
+import { parseExpr } from "../expr/parser";
+import { runtimeError } from "../runtime/errors";
+import { popLocalScope, popMacro, pushLocalScope, pushMacro, step, TRIM_SENTINEL, unsetScopedValue, writeScopedValue } from "../runtime/state";
+
+import type { ExecutionState } from "../runtime/state";
+import type { CompiledMacroDefinition, InstructionRenderContext, MacroRegistry, TemplateAst, TemplateNode } from "../types";
+
+function stringifyOutput(value: unknown): string {
+  if (value === null || typeof value === "undefined") return "";
+  if (typeof value === "string") return value;
+  if (typeof value === "number" || typeof value === "boolean") return String(value);
+  return JSON.stringify(value);
+}
+
+function toArgRecord(value: unknown): Record<string, unknown> {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return value as Record<string, unknown>;
+}
+
+function bindMacroParams(
+  macro: CompiledMacroDefinition,
+  providedArgs: Record<string, unknown>,
+  context: InstructionRenderContext,
+  state: ExecutionState,
+  macros?: MacroRegistry
+): Record<string, unknown> {
+  const bound: Record<string, unknown> = {};
+
+  for (const param of macro.params) {
+    if (param.name in providedArgs) {
+      bound[param.name] = providedArgs[param.name];
+      continue;
+    }
+
+    if (param.defaultExpr) {
+      bound[param.name] = evaluateExprNode({
+        ast: parseExpr(param.defaultExpr),
+        context,
+        state,
+        macros,
+      });
+      continue;
+    }
+
+    if (param.required) {
+      throw runtimeError("INVALID_MACRO", `Missing required macro param: ${param.name}`, {
+        macro: macro.name,
+        param: param.name,
+      });
+    }
+
+    bound[param.name] = null;
+  }
+
+  return bound;
+}
+
+export function renderTemplateAst(params: {
+  ast: TemplateAst;
+  context: InstructionRenderContext;
+  state: ExecutionState;
+  macros?: MacroRegistry;
+}): string {
+  const output = renderNodes(params.ast.nodes, params.context, params.state, params.macros).join("");
+  if (output.length > params.state.options.maxOutputChars) {
+    throw runtimeError("LIMIT_EXCEEDED", "runtime exceeded maxOutputChars", {
+      maxOutputChars: params.state.options.maxOutputChars,
+    });
+  }
+  return params.state.trimSentinelUsed ? stripTrimSentinel(output) : output;
+}
+
+function renderNodes(
+  nodes: TemplateNode[],
+  context: InstructionRenderContext,
+  state: ExecutionState,
+  macros?: MacroRegistry
+): string[] {
+  const chunks: string[] = [];
+
+  for (const node of nodes) {
+    step(state, `template:${node.kind}`);
+    if (node.kind === "text") {
+      chunks.push(node.value);
+      continue;
+    }
+    if (node.kind === "output") {
+      chunks.push(renderOutput(node, context, state, macros));
+      continue;
+    }
+    if (node.kind === "statement") {
+      const chunk = executeStatement(node, context, state, macros);
+      if (chunk.length > 0) chunks.push(chunk);
+      continue;
+    }
+    if (node.kind === "if") {
+      const condition = evaluateExprNode({
+        ast: node.condition,
+        context,
+        state,
+        macros,
+      });
+      chunks.push(...renderNodes(condition ? node.then : node.else, context, state, macros));
+      continue;
+    }
+
+    const iterable = evaluateExprNode({
+      ast: node.source,
+      context,
+      state,
+      macros,
+    });
+    if (!Array.isArray(iterable)) continue;
+    for (const item of iterable) {
+      pushLocalScope(state, { [node.itemName]: item });
+      chunks.push(...renderNodes(node.body, context, state, macros));
+      popLocalScope(state);
+    }
+  }
+
+  return chunks;
+}
+
+function renderOutput(
+  node: Extract<TemplateNode, { kind: "output" }>,
+  context: InstructionRenderContext,
+  state: ExecutionState,
+  macros?: MacroRegistry
+): string {
+  if (node.expr.kind === "call" && node.expr.name === "use") {
+    const args = node.expr.args.map((arg) =>
+      evaluateExprNode({
+        ast: arg,
+        context,
+        state,
+        macros,
+      })
+    );
+    const macroName = typeof args[0] === "string" ? args[0] : "";
+    const macro = macros?.getCompiled(macroName);
+    if (!macro || macro.kind !== "template") {
+      throw runtimeError("UNKNOWN_MACRO", `Unknown template macro: ${macroName}`, { macroName });
+    }
+    pushMacro(state, macroName);
+    try {
+      pushLocalScope(state, bindMacroParams(macro, toArgRecord(args[1]), context, state, macros));
+      const rendered = renderTemplateAst({
+        ast: macro.body,
+        context,
+        state,
+        macros,
+      });
+      popLocalScope(state);
+      return rendered;
+    } finally {
+      popMacro(state);
+    }
+  }
+
+  return stringifyOutput(
+    evaluateExprNode({
+      ast: node.expr,
+      context,
+      state,
+      macros,
+    })
+  );
+}
+
+function executeStatement(
+  node: Extract<TemplateNode, { kind: "statement" }>,
+  context: InstructionRenderContext,
+  state: ExecutionState,
+  macros?: MacroRegistry
+): string {
+  if (node.statement.kind === "trim") {
+    state.trimSentinelUsed = true;
+    return TRIM_SENTINEL;
+  }
+
+  if (node.statement.kind === "set") {
+    writeScopedValue(
+      state,
+      node.statement.scope,
+      node.statement.name,
+      evaluateExprNode({
+        ast: node.statement.value,
+        context,
+        state,
+        macros,
+      })
+    );
+    return "";
+  }
+
+  unsetScopedValue(state, node.statement.scope, node.statement.name);
+  return "";
+}
+
+function isBlankLine(line: string): boolean {
+  return line.trim().length === 0;
+}
+
+function stripTrimSentinel(text: string): string {
+  const normalized = text.replace(/\r\n/g, "\n");
+  const lines = normalized.split("\n");
+  const out: string[] = [];
+  let skipLeadingBlankLines = false;
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed === TRIM_SENTINEL) {
+      while (out.length > 0 && isBlankLine(out[out.length - 1] ?? "")) out.pop();
+      skipLeadingBlankLines = true;
+      continue;
+    }
+
+    if (line.includes(TRIM_SENTINEL)) {
+      const replaced = line.split(TRIM_SENTINEL).join("");
+      if (!(skipLeadingBlankLines && isBlankLine(replaced))) {
+        out.push(replaced);
+      }
+      if (!isBlankLine(replaced)) skipLeadingBlankLines = false;
+      continue;
+    }
+
+    if (skipLeadingBlankLines && isBlankLine(line)) continue;
+    out.push(line);
+    if (!isBlankLine(line)) skipLeadingBlankLines = false;
+  }
+
+  return out.join("\n");
+}
diff --git a/server/src/services/template-runtime/template/template-parser.js b/server/src/services/template-runtime/template/template-parser.js
new file mode 100644
index 00000000..34bf53b3
--- /dev/null
+++ b/server/src/services/template-runtime/template/template-parser.js
@@ -0,0 +1,1388 @@
+/* eslint-disable */
+// @generated by Peggy 5.1.0.
+//
+// https://peggyjs.org/
+
+"use strict";
+
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
+
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
+      }
+    }
+    return str;
+  }
+
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
+
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
+
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
+
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
+
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
+
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
+
+      any() {
+        return "any character";
+      },
+
+      end() {
+        return "end of input";
+      },
+
+      other(expectation) {
+        return expectation.description;
+      },
+    };
+
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    }
+
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
+
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
+        }
+        descriptions.length = j;
+      }
+
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
+
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
+
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
+      }
+    }
+
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    }
+
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+  }
+}
+
+function peg$parse(input, options) {
+  options = options !== undefined ? options : {};
+
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
+
+  const peg$startRuleFunctions = {
+    start: peg$parsestart,
+  };
+  let peg$startRuleFunction = peg$parsestart;
+
+  const peg$c0 = "{{";
+  const peg$c1 = "}}";
+  const peg$c2 = "#if";
+  const peg$c3 = "/if";
+  const peg$c4 = "{{else";
+  const peg$c5 = "{{ else";
+  const peg$c6 = "{{/if";
+  const peg$c7 = "{{ /if";
+  const peg$c8 = "else";
+  const peg$c9 = "#each";
+  const peg$c10 = "/each";
+  const peg$c11 = "{{/each";
+  const peg$c12 = "{{ /each";
+
+  const peg$r0 = /^[ \t\r\n]/;
+
+  const peg$e0 = peg$literalExpectation("{{", false);
+  const peg$e1 = peg$anyExpectation();
+  const peg$e2 = peg$literalExpectation("}}", false);
+  const peg$e3 = peg$literalExpectation("#if", false);
+  const peg$e4 = peg$literalExpectation("/if", false);
+  const peg$e5 = peg$literalExpectation("{{else", false);
+  const peg$e6 = peg$literalExpectation("{{ else", false);
+  const peg$e7 = peg$literalExpectation("{{/if", false);
+  const peg$e8 = peg$literalExpectation("{{ /if", false);
+  const peg$e9 = peg$literalExpectation("else", false);
+  const peg$e10 = peg$literalExpectation("#each", false);
+  const peg$e11 = peg$literalExpectation("/each", false);
+  const peg$e12 = peg$literalExpectation("{{/each", false);
+  const peg$e13 = peg$literalExpectation("{{ /each", false);
+  const peg$e14 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false, false);
+
+  function peg$f0(nodes) {    return { kind: "template_raw", nodes };  }
+  function peg$f1(nodes) {    return nodes;  }
+  function peg$f2(value) {
+    return { kind: "text", value };
+  }
+  function peg$f3(source) {
+    return { kind: "raw_output", source: (source ?? "").trim() };
+  }
+  function peg$f4(condition, then_nodes, else_nodes) {
+    return {
+      kind: "raw_if",
+      condition: (condition ?? "").trim(),
+      then: then_nodes,
+      else: else_nodes ?? [],
+    };
+  }
+  function peg$f5(node) {    return node;  }
+  function peg$f6(nodes) {
+    return nodes;
+  }
+  function peg$f7(node) {    return node;  }
+  function peg$f8(nodes) {
+    return nodes;
+  }
+  function peg$f9(source, body) {
+    return {
+      kind: "raw_each",
+      source: (source ?? "").trim(),
+      body,
+    };
+  }
+  function peg$f10(node) {    return node;  }
+  function peg$f11(nodes) {
+    return nodes;
+  }
+  function peg$f12(value) {    return value;  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
+
+  let peg$result;
+
+  if (options.startRule) {
+    if (!(options.startRule in peg$startRuleFunctions)) {
+      throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
+    }
+
+    peg$startRuleFunction = peg$startRuleFunctions[options.startRule];
+  }
+
+  function text() {
+    return input.substring(peg$savedPos, peg$currPos);
+  }
+
+  function offset() {
+    return peg$savedPos;
+  }
+
+  function range() {
+    return {
+      source: peg$source,
+      start: peg$savedPos,
+      end: peg$currPos,
+    };
+  }
+
+  function location() {
+    return peg$computeLocation(peg$savedPos, peg$currPos);
+  }
+
+  function expected(description, location) {
+    location = location !== undefined
+      ? location
+      : peg$computeLocation(peg$savedPos, peg$currPos);
+
+    throw peg$buildStructuredError(
+      [peg$otherExpectation(description)],
+      input.substring(peg$savedPos, peg$currPos),
+      location
+    );
+  }
+
+  function error(message, location) {
+    location = location !== undefined
+      ? location
+      : peg$computeLocation(peg$savedPos, peg$currPos);
+
+    throw peg$buildSimpleError(message, location);
+  }
+
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
+  function peg$literalExpectation(text, ignoreCase) {
+    return { type: "literal", text, ignoreCase };
+  }
+
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
+  }
+
+  function peg$anyExpectation() {
+    return { type: "any" };
+  }
+
+  function peg$endExpectation() {
+    return { type: "end" };
+  }
+
+  function peg$otherExpectation(description) {
+    return { type: "other", description };
+  }
+
+  function peg$computePosDetails(pos) {
+    let details = peg$posDetailsCache[pos];
+    let p;
+
+    if (details) {
+      return details;
+    } else {
+      if (pos >= peg$posDetailsCache.length) {
+        p = peg$posDetailsCache.length - 1;
+      } else {
+        p = pos;
+        while (!peg$posDetailsCache[--p]) {}
+      }
+
+      details = peg$posDetailsCache[p];
+      details = {
+        line: details.line,
+        column: details.column,
+      };
+
+      while (p < pos) {
+        if (input.charCodeAt(p) === 10) {
+          details.line++;
+          details.column = 1;
+        } else {
+          details.column++;
+        }
+
+        p++;
+      }
+
+      peg$posDetailsCache[pos] = details;
+
+      return details;
+    }
+  }
+
+  function peg$computeLocation(startPos, endPos, offset) {
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
+
+    const res = {
+      source: peg$source,
+      start: {
+        offset: startPos,
+        line: startPosDetails.line,
+        column: startPosDetails.column,
+      },
+      end: {
+        offset: endPos,
+        line: endPosDetails.line,
+        column: endPosDetails.column,
+      },
+    };
+    if (offset && peg$source && (typeof peg$source.offset === "function")) {
+      res.start = peg$source.offset(res.start);
+      res.end = peg$source.offset(res.end);
+    }
+    return res;
+  }
+
+  function peg$fail(expected) {
+    if (peg$currPos < peg$maxFailPos) { return; }
+
+    if (peg$currPos > peg$maxFailPos) {
+      peg$maxFailPos = peg$currPos;
+      peg$maxFailExpected = [];
+    }
+
+    peg$maxFailExpected.push(expected);
+  }
+
+  function peg$buildSimpleError(message, location) {
+    return new peg$SyntaxError(message, null, null, location);
+  }
+
+  function peg$buildStructuredError(expected, found, location) {
+    return new peg$SyntaxError(
+      peg$SyntaxError.buildMessage(expected, found),
+      expected,
+      found,
+      location
+    );
+  }
+
+  function peg$parsestart() {
+    let s0, s1;
+
+    s0 = peg$currPos;
+    s1 = peg$parsetemplate_nodes();
+    peg$savedPos = s0;
+    s1 = peg$f0(s1);
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsetemplate_nodes() {
+    let s0, s1, s2;
+
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$parseif_block();
+    if (s2 === peg$FAILED) {
+      s2 = peg$parseeach_block();
+      if (s2 === peg$FAILED) {
+        s2 = peg$parseoutput_tag();
+        if (s2 === peg$FAILED) {
+          s2 = peg$parsetext();
+        }
+      }
+    }
+    while (s2 !== peg$FAILED) {
+      s1.push(s2);
+      s2 = peg$parseif_block();
+      if (s2 === peg$FAILED) {
+        s2 = peg$parseeach_block();
+        if (s2 === peg$FAILED) {
+          s2 = peg$parseoutput_tag();
+          if (s2 === peg$FAILED) {
+            s2 = peg$parsetext();
+          }
+        }
+      }
+    }
+    peg$savedPos = s0;
+    s1 = peg$f1(s1);
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsetext() {
+    let s0, s1, s2, s3, s4, s5;
+
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = [];
+    s3 = peg$currPos;
+    s4 = peg$currPos;
+    peg$silentFails++;
+    if (input.substr(peg$currPos, 2) === peg$c0) {
+      s5 = peg$c0;
+      peg$currPos += 2;
+    } else {
+      s5 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
+    }
+    peg$silentFails--;
+    if (s5 === peg$FAILED) {
+      s4 = undefined;
+    } else {
+      peg$currPos = s4;
+      s4 = peg$FAILED;
+    }
+    if (s4 !== peg$FAILED) {
+      if (input.length > peg$currPos) {
+        s5 = input.charAt(peg$currPos);
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e1); }
+      }
+      if (s5 !== peg$FAILED) {
+        s4 = [s4, s5];
+        s3 = s4;
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s3;
+      s3 = peg$FAILED;
+    }
+    if (s3 !== peg$FAILED) {
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$currPos;
+        peg$silentFails++;
+        if (input.substr(peg$currPos, 2) === peg$c0) {
+          s5 = peg$c0;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e0); }
+        }
+        peg$silentFails--;
+        if (s5 === peg$FAILED) {
+          s4 = undefined;
+        } else {
+          peg$currPos = s4;
+          s4 = peg$FAILED;
+        }
+        if (s4 !== peg$FAILED) {
+          if (input.length > peg$currPos) {
+            s5 = input.charAt(peg$currPos);
+            peg$currPos++;
+          } else {
+            s5 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e1); }
+          }
+          if (s5 !== peg$FAILED) {
+            s4 = [s4, s5];
+            s3 = s4;
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+    } else {
+      s2 = peg$FAILED;
+    }
+    if (s2 !== peg$FAILED) {
+      s1 = input.substring(s1, peg$currPos);
+    } else {
+      s1 = s2;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f2(s1);
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseoutput_tag() {
+    let s0, s1, s2, s3, s4, s5;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c0) {
+      s1 = peg$c0;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      s3 = peg$parsetag_source();
+      if (s3 === peg$FAILED) {
+        s3 = null;
+      }
+      s4 = peg$parse_();
+      if (input.substr(peg$currPos, 2) === peg$c1) {
+        s5 = peg$c1;
+        peg$currPos += 2;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e2); }
+      }
+      if (s5 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f3(s3);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseif_block() {
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c0) {
+      s1 = peg$c0;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (input.substr(peg$currPos, 3) === peg$c2) {
+        s3 = peg$c2;
+        peg$currPos += 3;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e3); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse__();
+        if (s4 !== peg$FAILED) {
+          s5 = peg$parsetag_source();
+          if (s5 === peg$FAILED) {
+            s5 = null;
+          }
+          s6 = peg$parse_();
+          if (input.substr(peg$currPos, 2) === peg$c1) {
+            s7 = peg$c1;
+            peg$currPos += 2;
+          } else {
+            s7 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e2); }
+          }
+          if (s7 !== peg$FAILED) {
+            s8 = peg$parseif_body();
+            s9 = peg$parseif_else();
+            if (s9 === peg$FAILED) {
+              s9 = null;
+            }
+            if (input.substr(peg$currPos, 2) === peg$c0) {
+              s10 = peg$c0;
+              peg$currPos += 2;
+            } else {
+              s10 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e0); }
+            }
+            if (s10 !== peg$FAILED) {
+              s11 = peg$parse_();
+              if (input.substr(peg$currPos, 3) === peg$c3) {
+                s12 = peg$c3;
+                peg$currPos += 3;
+              } else {
+                s12 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e4); }
+              }
+              if (s12 !== peg$FAILED) {
+                s13 = peg$parse_();
+                if (input.substr(peg$currPos, 2) === peg$c1) {
+                  s14 = peg$c1;
+                  peg$currPos += 2;
+                } else {
+                  s14 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e2); }
+                }
+                if (s14 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s0 = peg$f4(s5, s8, s9);
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseif_body() {
+    let s0, s1, s2, s3, s4;
+
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$currPos;
+    s3 = peg$currPos;
+    peg$silentFails++;
+    if (input.substr(peg$currPos, 6) === peg$c4) {
+      s4 = peg$c4;
+      peg$currPos += 6;
+    } else {
+      s4 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e5); }
+    }
+    if (s4 === peg$FAILED) {
+      if (input.substr(peg$currPos, 7) === peg$c5) {
+        s4 = peg$c5;
+        peg$currPos += 7;
+      } else {
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e6); }
+      }
+      if (s4 === peg$FAILED) {
+        if (input.substr(peg$currPos, 5) === peg$c6) {
+          s4 = peg$c6;
+          peg$currPos += 5;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e7); }
+        }
+        if (s4 === peg$FAILED) {
+          if (input.substr(peg$currPos, 6) === peg$c7) {
+            s4 = peg$c7;
+            peg$currPos += 6;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e8); }
+          }
+        }
+      }
+    }
+    peg$silentFails--;
+    if (s4 === peg$FAILED) {
+      s3 = undefined;
+    } else {
+      peg$currPos = s3;
+      s3 = peg$FAILED;
+    }
+    if (s3 !== peg$FAILED) {
+      s4 = peg$parseif_block();
+      if (s4 === peg$FAILED) {
+        s4 = peg$parseeach_block();
+        if (s4 === peg$FAILED) {
+          s4 = peg$parseoutput_tag();
+          if (s4 === peg$FAILED) {
+            s4 = peg$parsetext();
+          }
+        }
+      }
+      if (s4 !== peg$FAILED) {
+        peg$savedPos = s2;
+        s2 = peg$f5(s4);
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s2;
+      s2 = peg$FAILED;
+    }
+    while (s2 !== peg$FAILED) {
+      s1.push(s2);
+      s2 = peg$currPos;
+      s3 = peg$currPos;
+      peg$silentFails++;
+      if (input.substr(peg$currPos, 6) === peg$c4) {
+        s4 = peg$c4;
+        peg$currPos += 6;
+      } else {
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e5); }
+      }
+      if (s4 === peg$FAILED) {
+        if (input.substr(peg$currPos, 7) === peg$c5) {
+          s4 = peg$c5;
+          peg$currPos += 7;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e6); }
+        }
+        if (s4 === peg$FAILED) {
+          if (input.substr(peg$currPos, 5) === peg$c6) {
+            s4 = peg$c6;
+            peg$currPos += 5;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e7); }
+          }
+          if (s4 === peg$FAILED) {
+            if (input.substr(peg$currPos, 6) === peg$c7) {
+              s4 = peg$c7;
+              peg$currPos += 6;
+            } else {
+              s4 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e8); }
+            }
+          }
+        }
+      }
+      peg$silentFails--;
+      if (s4 === peg$FAILED) {
+        s3 = undefined;
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parseif_block();
+        if (s4 === peg$FAILED) {
+          s4 = peg$parseeach_block();
+          if (s4 === peg$FAILED) {
+            s4 = peg$parseoutput_tag();
+            if (s4 === peg$FAILED) {
+              s4 = peg$parsetext();
+            }
+          }
+        }
+        if (s4 !== peg$FAILED) {
+          peg$savedPos = s2;
+          s2 = peg$f5(s4);
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+    }
+    peg$savedPos = s0;
+    s1 = peg$f6(s1);
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseif_else() {
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c0) {
+      s1 = peg$c0;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (input.substr(peg$currPos, 4) === peg$c8) {
+        s3 = peg$c8;
+        peg$currPos += 4;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e9); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse_();
+        if (input.substr(peg$currPos, 2) === peg$c1) {
+          s5 = peg$c1;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e2); }
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = [];
+          s7 = peg$currPos;
+          s8 = peg$currPos;
+          peg$silentFails++;
+          if (input.substr(peg$currPos, 5) === peg$c6) {
+            s9 = peg$c6;
+            peg$currPos += 5;
+          } else {
+            s9 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e7); }
+          }
+          if (s9 === peg$FAILED) {
+            if (input.substr(peg$currPos, 6) === peg$c7) {
+              s9 = peg$c7;
+              peg$currPos += 6;
+            } else {
+              s9 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e8); }
+            }
+          }
+          peg$silentFails--;
+          if (s9 === peg$FAILED) {
+            s8 = undefined;
+          } else {
+            peg$currPos = s8;
+            s8 = peg$FAILED;
+          }
+          if (s8 !== peg$FAILED) {
+            s9 = peg$parseif_block();
+            if (s9 === peg$FAILED) {
+              s9 = peg$parseeach_block();
+              if (s9 === peg$FAILED) {
+                s9 = peg$parseoutput_tag();
+                if (s9 === peg$FAILED) {
+                  s9 = peg$parsetext();
+                }
+              }
+            }
+            if (s9 !== peg$FAILED) {
+              peg$savedPos = s7;
+              s7 = peg$f7(s9);
+            } else {
+              peg$currPos = s7;
+              s7 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s7;
+            s7 = peg$FAILED;
+          }
+          while (s7 !== peg$FAILED) {
+            s6.push(s7);
+            s7 = peg$currPos;
+            s8 = peg$currPos;
+            peg$silentFails++;
+            if (input.substr(peg$currPos, 5) === peg$c6) {
+              s9 = peg$c6;
+              peg$currPos += 5;
+            } else {
+              s9 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e7); }
+            }
+            if (s9 === peg$FAILED) {
+              if (input.substr(peg$currPos, 6) === peg$c7) {
+                s9 = peg$c7;
+                peg$currPos += 6;
+              } else {
+                s9 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e8); }
+              }
+            }
+            peg$silentFails--;
+            if (s9 === peg$FAILED) {
+              s8 = undefined;
+            } else {
+              peg$currPos = s8;
+              s8 = peg$FAILED;
+            }
+            if (s8 !== peg$FAILED) {
+              s9 = peg$parseif_block();
+              if (s9 === peg$FAILED) {
+                s9 = peg$parseeach_block();
+                if (s9 === peg$FAILED) {
+                  s9 = peg$parseoutput_tag();
+                  if (s9 === peg$FAILED) {
+                    s9 = peg$parsetext();
+                  }
+                }
+              }
+              if (s9 !== peg$FAILED) {
+                peg$savedPos = s7;
+                s7 = peg$f7(s9);
+              } else {
+                peg$currPos = s7;
+                s7 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s7;
+              s7 = peg$FAILED;
+            }
+          }
+          peg$savedPos = s0;
+          s0 = peg$f8(s6);
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseeach_block() {
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c0) {
+      s1 = peg$c0;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (input.substr(peg$currPos, 5) === peg$c9) {
+        s3 = peg$c9;
+        peg$currPos += 5;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e10); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parse__();
+        if (s4 !== peg$FAILED) {
+          s5 = peg$parsetag_source();
+          if (s5 === peg$FAILED) {
+            s5 = null;
+          }
+          s6 = peg$parse_();
+          if (input.substr(peg$currPos, 2) === peg$c1) {
+            s7 = peg$c1;
+            peg$currPos += 2;
+          } else {
+            s7 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e2); }
+          }
+          if (s7 !== peg$FAILED) {
+            s8 = peg$parseeach_body();
+            if (input.substr(peg$currPos, 2) === peg$c0) {
+              s9 = peg$c0;
+              peg$currPos += 2;
+            } else {
+              s9 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e0); }
+            }
+            if (s9 !== peg$FAILED) {
+              s10 = peg$parse_();
+              if (input.substr(peg$currPos, 5) === peg$c10) {
+                s11 = peg$c10;
+                peg$currPos += 5;
+              } else {
+                s11 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e11); }
+              }
+              if (s11 !== peg$FAILED) {
+                s12 = peg$parse_();
+                if (input.substr(peg$currPos, 2) === peg$c1) {
+                  s13 = peg$c1;
+                  peg$currPos += 2;
+                } else {
+                  s13 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e2); }
+                }
+                if (s13 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s0 = peg$f9(s5, s8);
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseeach_body() {
+    let s0, s1, s2, s3, s4;
+
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$currPos;
+    s3 = peg$currPos;
+    peg$silentFails++;
+    if (input.substr(peg$currPos, 7) === peg$c11) {
+      s4 = peg$c11;
+      peg$currPos += 7;
+    } else {
+      s4 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e12); }
+    }
+    if (s4 === peg$FAILED) {
+      if (input.substr(peg$currPos, 8) === peg$c12) {
+        s4 = peg$c12;
+        peg$currPos += 8;
+      } else {
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e13); }
+      }
+    }
+    peg$silentFails--;
+    if (s4 === peg$FAILED) {
+      s3 = undefined;
+    } else {
+      peg$currPos = s3;
+      s3 = peg$FAILED;
+    }
+    if (s3 !== peg$FAILED) {
+      s4 = peg$parseif_block();
+      if (s4 === peg$FAILED) {
+        s4 = peg$parseeach_block();
+        if (s4 === peg$FAILED) {
+          s4 = peg$parseoutput_tag();
+          if (s4 === peg$FAILED) {
+            s4 = peg$parsetext();
+          }
+        }
+      }
+      if (s4 !== peg$FAILED) {
+        peg$savedPos = s2;
+        s2 = peg$f10(s4);
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s2;
+      s2 = peg$FAILED;
+    }
+    while (s2 !== peg$FAILED) {
+      s1.push(s2);
+      s2 = peg$currPos;
+      s3 = peg$currPos;
+      peg$silentFails++;
+      if (input.substr(peg$currPos, 7) === peg$c11) {
+        s4 = peg$c11;
+        peg$currPos += 7;
+      } else {
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e12); }
+      }
+      if (s4 === peg$FAILED) {
+        if (input.substr(peg$currPos, 8) === peg$c12) {
+          s4 = peg$c12;
+          peg$currPos += 8;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e13); }
+        }
+      }
+      peg$silentFails--;
+      if (s4 === peg$FAILED) {
+        s3 = undefined;
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parseif_block();
+        if (s4 === peg$FAILED) {
+          s4 = peg$parseeach_block();
+          if (s4 === peg$FAILED) {
+            s4 = peg$parseoutput_tag();
+            if (s4 === peg$FAILED) {
+              s4 = peg$parsetext();
+            }
+          }
+        }
+        if (s4 !== peg$FAILED) {
+          peg$savedPos = s2;
+          s2 = peg$f10(s4);
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+    }
+    peg$savedPos = s0;
+    s1 = peg$f11(s1);
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsetag_source() {
+    let s0, s1, s2, s3, s4, s5;
+
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = [];
+    s3 = peg$currPos;
+    s4 = peg$currPos;
+    peg$silentFails++;
+    if (input.substr(peg$currPos, 2) === peg$c1) {
+      s5 = peg$c1;
+      peg$currPos += 2;
+    } else {
+      s5 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e2); }
+    }
+    peg$silentFails--;
+    if (s5 === peg$FAILED) {
+      s4 = undefined;
+    } else {
+      peg$currPos = s4;
+      s4 = peg$FAILED;
+    }
+    if (s4 !== peg$FAILED) {
+      if (input.length > peg$currPos) {
+        s5 = input.charAt(peg$currPos);
+        peg$currPos++;
+      } else {
+        s5 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e1); }
+      }
+      if (s5 !== peg$FAILED) {
+        s4 = [s4, s5];
+        s3 = s4;
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s3;
+      s3 = peg$FAILED;
+    }
+    if (s3 !== peg$FAILED) {
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$currPos;
+        peg$silentFails++;
+        if (input.substr(peg$currPos, 2) === peg$c1) {
+          s5 = peg$c1;
+          peg$currPos += 2;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e2); }
+        }
+        peg$silentFails--;
+        if (s5 === peg$FAILED) {
+          s4 = undefined;
+        } else {
+          peg$currPos = s4;
+          s4 = peg$FAILED;
+        }
+        if (s4 !== peg$FAILED) {
+          if (input.length > peg$currPos) {
+            s5 = input.charAt(peg$currPos);
+            peg$currPos++;
+          } else {
+            s5 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e1); }
+          }
+          if (s5 !== peg$FAILED) {
+            s4 = [s4, s5];
+            s3 = s4;
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+    } else {
+      s2 = peg$FAILED;
+    }
+    if (s2 !== peg$FAILED) {
+      s1 = input.substring(s1, peg$currPos);
+    } else {
+      s1 = s2;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f12(s1);
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parse_() {
+    let s0, s1;
+
+    s0 = [];
+    s1 = input.charAt(peg$currPos);
+    if (peg$r0.test(s1)) {
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+    }
+    while (s1 !== peg$FAILED) {
+      s0.push(s1);
+      s1 = input.charAt(peg$currPos);
+      if (peg$r0.test(s1)) {
+        peg$currPos++;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e14); }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parse__() {
+    let s0, s1;
+
+    s0 = [];
+    s1 = input.charAt(peg$currPos);
+    if (peg$r0.test(s1)) {
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+    }
+    if (s1 !== peg$FAILED) {
+      while (s1 !== peg$FAILED) {
+        s0.push(s1);
+        s1 = input.charAt(peg$currPos);
+        if (peg$r0.test(s1)) {
+          peg$currPos++;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e14); }
+        }
+      }
+    } else {
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  peg$result = peg$startRuleFunction();
+
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+      peg$fail(peg$endExpectation());
+    }
+
+    throw peg$buildStructuredError(
+      peg$maxFailExpected,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
+  }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
+}
+
+module.exports = {
+  StartRules: ["start"],
+  SyntaxError: peg$SyntaxError,
+  parse: peg$parse,
+};
diff --git a/server/src/services/template-runtime/template/template-parser.peggy b/server/src/services/template-runtime/template/template-parser.peggy
new file mode 100644
index 00000000..478e9b0f
--- /dev/null
+++ b/server/src/services/template-runtime/template/template-parser.peggy
@@ -0,0 +1,60 @@
+start
+  = nodes:template_nodes { return { kind: "template_raw", nodes }; }
+
+template_nodes
+  = nodes:(if_block / each_block / output_tag / text)* { return nodes; }
+
+text
+  = value:$((!"{{" .)+) {
+      return { kind: "text", value };
+    }
+
+output_tag
+  = "{{" _ source:tag_source? _ "}}" {
+      return { kind: "raw_output", source: (source ?? "").trim() };
+    }
+
+if_block
+  = "{{" _ "#if" __ condition:tag_source? _ "}}"
+    then_nodes:if_body
+    else_nodes:if_else?
+    "{{" _ "/if" _ "}}" {
+      return {
+        kind: "raw_if",
+        condition: (condition ?? "").trim(),
+        then: then_nodes,
+        else: else_nodes ?? [],
+      };
+    }
+
+if_body
+  = nodes:(!("{{else" / "{{ else" / "{{/if" / "{{ /if") node:(if_block / each_block / output_tag / text) { return node; })* {
+      return nodes;
+    }
+
+if_else
+  = "{{" _ "else" _ "}}" nodes:(!("{{/if" / "{{ /if") node:(if_block / each_block / output_tag / text) { return node; })* {
+      return nodes;
+    }
+
+each_block
+  = "{{" _ "#each" __ source:tag_source? _ "}}"
+    body:each_body
+    "{{" _ "/each" _ "}}" {
+      return {
+        kind: "raw_each",
+        source: (source ?? "").trim(),
+        body,
+      };
+    }
+
+each_body
+  = nodes:(!("{{/each" / "{{ /each") node:(if_block / each_block / output_tag / text) { return node; })* {
+      return nodes;
+    }
+
+tag_source
+  = value:$((!"}}" .)+) { return value; }
+
+_ = [ \t\r\n]*
+__ = [ \t\r\n]+
diff --git a/server/src/services/template-runtime/types.ts b/server/src/services/template-runtime/types.ts
new file mode 100644
index 00000000..7900e882
--- /dev/null
+++ b/server/src/services/template-runtime/types.ts
@@ -0,0 +1,201 @@
+import type { InstructionRenderContext as BaseInstructionRenderContext } from "../chat-core/prompt-template-renderer";
+
+export type InstructionRenderContext = BaseInstructionRenderContext;
+
+export type RuntimeErrorCode =
+  | "EXPR_PARSE_ERROR"
+  | "TEMPLATE_PARSE_ERROR"
+  | "UNKNOWN_ST_ALIAS"
+  | "UNKNOWN_HELPER"
+  | "UNKNOWN_MACRO"
+  | "HELPER_ERROR"
+  | "MISSING_VARIABLE"
+  | "INVALID_SCOPE"
+  | "MACRO_CYCLE"
+  | "LIMIT_EXCEEDED"
+  | "INVALID_MACRO";
+
+export class RuntimeError extends Error {
+  code: RuntimeErrorCode;
+  details?: Record<string, unknown>;
+
+  constructor(code: RuntimeErrorCode, message: string, details?: Record<string, unknown>) {
+    super(message);
+    this.name = "RuntimeError";
+    this.code = code;
+    this.details = details;
+  }
+}
+
+export type DebugTrace = {
+  parser?: unknown;
+  loweredAst?: unknown;
+  execution?: string[];
+};
+
+export type RuntimeOptions = {
+  strictVariables?: boolean;
+  rng?: () => number;
+  maxMacroDepth?: number;
+  maxExecutionSteps?: number;
+  maxOutputChars?: number;
+  maxObjectNesting?: number;
+  maxAstNodes?: number;
+  debugTrace?: DebugTrace;
+};
+
+export type RuntimeState = {
+  scopes: {
+    local: Record<string, unknown>;
+    render: Record<string, unknown>;
+    turn: Record<string, unknown>;
+    session?: Record<string, unknown>;
+  };
+};
+
+export type ExprNode =
+  | { kind: "literal"; value: null | boolean | number | string }
+  | { kind: "path"; segments: string[] }
+  | { kind: "call"; name: string; args: ExprNode[] }
+  | { kind: "array"; items: ExprNode[] }
+  | { kind: "object"; entries: Array<{ key: string; value: ExprNode }> }
+  | { kind: "unary"; op: "not"; value: ExprNode }
+  | {
+      kind: "binary";
+      op: "and" | "or" | "eq" | "neq";
+      left: ExprNode;
+      right: ExprNode;
+    };
+
+export type ExprAst = ExprNode;
+
+export type StatementScope = "local" | "render" | "turn" | "session";
+
+export type StatementNode =
+  | { kind: "trim" }
+  | { kind: "set"; scope: StatementScope; name: string; value: ExprNode }
+  | { kind: "unset"; scope: StatementScope; name: string };
+
+export type TemplateNode =
+  | { kind: "text"; value: string }
+  | { kind: "output"; expr: ExprNode }
+  | { kind: "if"; condition: ExprNode; then: TemplateNode[]; else: TemplateNode[] }
+  | { kind: "each"; source: ExprNode; itemName: string; body: TemplateNode[] }
+  | { kind: "statement"; statement: StatementNode };
+
+export type TemplateAst = {
+  kind: "template";
+  nodes: TemplateNode[];
+};
+
+export type MacroParamDefinition = {
+  name: string;
+  required: boolean;
+  defaultExpr?: string;
+};
+
+export type MacroDefinition = {
+  id?: string;
+  ownerId?: string;
+  name: string;
+  kind: "value" | "template";
+  description?: string;
+  engine?: "native_v1";
+  params: MacroParamDefinition[];
+  body: string;
+};
+
+export type CompiledMacroDefinition =
+  | {
+      name: string;
+      kind: "value";
+      params: MacroParamDefinition[];
+      body: ExprAst;
+    }
+  | {
+      name: string;
+      kind: "template";
+      params: MacroParamDefinition[];
+      body: TemplateAst;
+    };
+
+export type MacroRegistry = {
+  definitions: ReadonlyMap<string, MacroDefinition>;
+  get(name: string): MacroDefinition | undefined;
+  getCompiled(name: string): CompiledMacroDefinition | undefined;
+};
+
+export type HelperInvocation = {
+  args: unknown[];
+  context: InstructionRenderContext;
+  state: RuntimeState;
+  options: Required<
+    Pick<
+      RuntimeOptions,
+      | "strictVariables"
+      | "maxMacroDepth"
+      | "maxExecutionSteps"
+      | "maxOutputChars"
+      | "maxObjectNesting"
+      | "maxAstNodes"
+    >
+  > & {
+    rng: () => number;
+    debugTrace?: DebugTrace;
+  };
+};
+
+export type HelperDefinition = (input: HelperInvocation) => unknown;
+
+export type RawTemplateNode =
+  | { kind: "text"; value: string }
+  | { kind: "raw_output"; source: string }
+  | { kind: "raw_if"; condition: string; then: RawTemplateNode[]; else: RawTemplateNode[] }
+  | { kind: "raw_each"; source: string; body: RawTemplateNode[] };
+
+export type RawTemplateAst = {
+  kind: "template_raw";
+  nodes: RawTemplateNode[];
+};
+
+export function countExprNodes(node: ExprNode): number {
+  switch (node.kind) {
+    case "literal":
+    case "path":
+      return 1;
+    case "call":
+      return 1 + node.args.reduce((sum, arg) => sum + countExprNodes(arg), 0);
+    case "array":
+      return 1 + node.items.reduce((sum, item) => sum + countExprNodes(item), 0);
+    case "object":
+      return 1 + node.entries.reduce((sum, entry) => sum + countExprNodes(entry.value), 0);
+    case "unary":
+      return 1 + countExprNodes(node.value);
+    case "binary":
+      return 1 + countExprNodes(node.left) + countExprNodes(node.right);
+  }
+}
+
+export function countTemplateNodes(nodes: TemplateNode[]): number {
+  return nodes.reduce((sum, node) => sum + countTemplateNode(node), 0);
+}
+
+function countTemplateNode(node: TemplateNode): number {
+  switch (node.kind) {
+    case "text":
+      return 1;
+    case "output":
+      return 1 + countExprNodes(node.expr);
+    case "statement":
+      return 1 + ("value" in node.statement ? countExprNodes(node.statement.value) : 0);
+    case "if":
+      return (
+        1 +
+        countExprNodes(node.condition) +
+        countTemplateNodes(node.then) +
+        countTemplateNodes(node.else)
+      );
+    case "each":
+      return 1 + countExprNodes(node.source) + countTemplateNodes(node.body);
+  }
+}
diff --git a/server/yarn.lock b/server/yarn.lock
index 9ea2cbdf..02787958 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -708,6 +708,13 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@peggyjs/from-mem@3.1.3":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@peggyjs/from-mem/-/from-mem-3.1.3.tgz#2956c3c68ec2e08e55178049a327009ee61541b8"
+  integrity sha512-LLlgtfXIaeYXoOYovOI0spLM8ZXaqkAlmcRRrLzHJzLMqkU6Sw0R4KMoCoHx1PjaP815pSCBlS+BN6aD8t1Jgg==
+  dependencies:
+    semver "7.7.4"
+
 "@rollup/rollup-android-arm-eabi@4.57.1":
   version "4.57.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz#add5e608d4e7be55bc3ca3d962490b8b1890e088"
@@ -1687,6 +1694,11 @@ commander@^10.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
   integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
+commander@^14.0.3:
+  version "14.0.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.3.tgz#425d79b48f9af82fcd9e4fc1ea8af6c5ec07bbc2"
+  integrity sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==
+
 commander@^9.0.0:
   version "9.5.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
@@ -3435,6 +3447,15 @@ pathval@^2.0.0:
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.1.tgz#8855c5a2899af072d6ac05d11e46045ad0dc605d"
   integrity sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==
 
+peggy@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/peggy/-/peggy-5.1.0.tgz#8e2a681128cf776648417f60394a40b4a712f503"
+  integrity sha512-IEo5aYRZ2kXH4Qby06cjtL114PZnwLoTiA41vUmg2vPZgANn+c87m5BUurhuDr5/cu758ZlpgsAfBVx+hhO5+w==
+  dependencies:
+    "@peggyjs/from-mem" "3.1.3"
+    commander "^14.0.3"
+    source-map-generator "2.0.6"
+
 picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
@@ -3735,6 +3756,11 @@ safe-regex-test@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+semver@7.7.4:
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
+  integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==
+
 semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
@@ -3925,6 +3951,11 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+source-map-generator@2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/source-map-generator/-/source-map-generator-2.0.6.tgz#284776dff4bd5efdefead67aaed0c0f85f5a42ca"
+  integrity sha512-IlassDs1Ve8nV6uyQZXF9kdkJpVKnMte2JZQXu13M0A5zwc+vu6+LNHfmxsHBMDtoZE21RHiKI0/xvpecZRCNg==
+
 source-map-js@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"

From def69be36ec2b27ec5f2b2cdf9a515bda8cb2192 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Tue, 17 Mar 2026 00:59:46 +0300
Subject: [PATCH 23/54] fix: world info

---
 .../world-info/world-info-bindings.test.ts    | 208 ++++++++++++
 .../world-info/world-info-bindings.ts         |  28 +-
 .../input/chat-management-menu.tsx            |  19 +-
 .../input/chat-world-info-binding-dialog.tsx  |  96 ++++++
 .../sidebars/agent-cards/agent-card.tsx       |  39 ++-
 .../features/sidebars/agent-cards/index.tsx   |   6 +
 .../features/sidebars/user-person/index.tsx   |  30 +-
 .../sidebars/user-person/user-person-card.tsx |  24 +-
 .../user-person/user-person-editor.tsx        |   3 +
 .../user-person-world-info-section.tsx        |  82 +++++
 .../features/sidebars/world-info/index.tsx    |  73 +++--
 web/src/i18n/resources/en/agentCards.ts       |   5 +-
 web/src/i18n/resources/en/chat.ts             |   7 +
 web/src/i18n/resources/en/userPersons.ts      |  10 +
 web/src/i18n/resources/en/worldInfo.ts        |  10 +-
 web/src/i18n/resources/ru/agentCards.ts       |   5 +-
 web/src/i18n/resources/ru/chat.ts             |   7 +
 web/src/i18n/resources/ru/userPersons.ts      |  10 +
 web/src/i18n/resources/ru/worldInfo.ts        |  10 +-
 .../model/world-info/binding-utils.test.ts    | 127 ++++++++
 web/src/model/world-info/binding-utils.ts     |  66 ++++
 web/src/model/world-info/index.ts             | 296 ++++++++++--------
 22 files changed, 958 insertions(+), 203 deletions(-)
 create mode 100644 server/src/services/world-info/world-info-bindings.test.ts
 create mode 100644 web/src/features/chat-window/input/chat-world-info-binding-dialog.tsx
 create mode 100644 web/src/features/sidebars/user-person/user-person-world-info-section.tsx
 create mode 100644 web/src/model/world-info/binding-utils.test.ts
 create mode 100644 web/src/model/world-info/binding-utils.ts

diff --git a/server/src/services/world-info/world-info-bindings.test.ts b/server/src/services/world-info/world-info-bindings.test.ts
new file mode 100644
index 00000000..6dc25054
--- /dev/null
+++ b/server/src/services/world-info/world-info-bindings.test.ts
@@ -0,0 +1,208 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import { resolveActiveWorldInfoBooks } from "./world-info-bindings";
+import {
+  getWorldInfoBooksByIds,
+  listWorldInfoBindings,
+} from "./world-info-repositories";
+
+import type { WorldInfoBindingDto, WorldInfoBookDto } from "./world-info-types";
+
+vi.mock("./world-info-repositories", () => ({
+  listWorldInfoBindings: vi.fn(),
+  getWorldInfoBooksByIds: vi.fn(),
+}));
+
+function makeBinding(
+  id: string,
+  patch: Partial<WorldInfoBindingDto>
+): WorldInfoBindingDto {
+  return {
+    id,
+    ownerId: "global",
+    scope: "global",
+    scopeId: null,
+    bookId: `${id}-book`,
+    bindingRole: "additional",
+    displayOrder: 0,
+    enabled: true,
+    meta: null,
+    createdAt: new Date("2026-01-01T00:00:00.000Z"),
+    updatedAt: new Date("2026-01-01T00:00:00.000Z"),
+    ...patch,
+  };
+}
+
+function makeBook(id: string): WorldInfoBookDto {
+  return {
+    id,
+    ownerId: "global",
+    slug: id,
+    name: id,
+    description: null,
+    data: { entries: {}, extensions: {} },
+    extensions: null,
+    source: "native",
+    version: 1,
+    createdAt: new Date("2026-01-01T00:00:00.000Z"),
+    updatedAt: new Date("2026-01-01T00:00:00.000Z"),
+    deletedAt: null,
+  };
+}
+
+describe("resolveActiveWorldInfoBooks", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    vi.mocked(getWorldInfoBooksByIds).mockImplementation(async ({ ids }) =>
+      ids.map((id) => makeBook(id))
+    );
+  });
+
+  it("orders active bindings by global, entity, persona, then chat", async () => {
+    vi.mocked(listWorldInfoBindings).mockImplementation(async ({ scope }) => {
+      if (scope === "global") {
+        return [
+          makeBinding("global-2", {
+            scope: "global",
+            bookId: "book-global-2",
+            displayOrder: 1,
+          }),
+          makeBinding("global-1", {
+            scope: "global",
+            bookId: "book-global-1",
+            displayOrder: 0,
+          }),
+        ];
+      }
+
+      if (scope === "entity_profile") {
+        return [
+          makeBinding("entity-1", {
+            scope: "entity_profile",
+            scopeId: "entity-1",
+            bookId: "book-entity-1",
+          }),
+        ];
+      }
+
+      if (scope === "persona") {
+        return [
+          makeBinding("persona-1", {
+            scope: "persona",
+            scopeId: "persona-1",
+            bookId: "book-persona-1",
+          }),
+        ];
+      }
+
+      if (scope === "chat") {
+        return [
+          makeBinding("chat-1", {
+            scope: "chat",
+            scopeId: "chat-1",
+            bookId: "book-chat-1",
+          }),
+        ];
+      }
+
+      return [];
+    });
+
+    const result = await resolveActiveWorldInfoBooks({
+      ownerId: "global",
+      chatId: "chat-1",
+      entityProfileId: "entity-1",
+      personaId: "persona-1",
+      settings: { insertionStrategy: 2, characterStrategy: 0 },
+    });
+
+    expect(result.orderedBindings.map((item) => item.bookId)).toEqual([
+      "book-global-1",
+      "book-global-2",
+      "book-entity-1",
+      "book-persona-1",
+      "book-chat-1",
+    ]);
+    expect(vi.mocked(getWorldInfoBooksByIds)).toHaveBeenCalledWith({
+      ownerId: "global",
+      ids: [
+        "book-global-1",
+        "book-global-2",
+        "book-entity-1",
+        "book-persona-1",
+        "book-chat-1",
+      ],
+    });
+    expect(result.orderedBooks.map((item) => item.id)).toEqual([
+      "book-global-1",
+      "book-global-2",
+      "book-entity-1",
+      "book-persona-1",
+      "book-chat-1",
+    ]);
+  });
+
+  it("filters disabled bindings and sorts legacy multi-bindings deterministically", async () => {
+    vi.mocked(listWorldInfoBindings).mockImplementation(async ({ scope }) => {
+      if (scope === "global") {
+        return [
+          makeBinding("late", {
+            scope: "global",
+            bookId: "book-late",
+            displayOrder: 3,
+          }),
+          makeBinding("same-order-b", {
+            scope: "global",
+            bookId: "book-same-order-b",
+            displayOrder: 1,
+            createdAt: new Date("2026-01-03T00:00:00.000Z"),
+          }),
+          makeBinding("disabled", {
+            scope: "global",
+            bookId: "book-disabled",
+            displayOrder: 0,
+            enabled: false,
+          }),
+          makeBinding("same-order-a", {
+            scope: "global",
+            bookId: "book-same-order-a",
+            displayOrder: 1,
+            createdAt: new Date("2026-01-02T00:00:00.000Z"),
+          }),
+          makeBinding("same-order-a-z", {
+            scope: "global",
+            bookId: "book-same-order-a-z",
+            displayOrder: 1,
+            createdAt: new Date("2026-01-02T00:00:00.000Z"),
+            id: "z-id",
+          }),
+          makeBinding("same-order-a-a", {
+            scope: "global",
+            bookId: "book-same-order-a-a",
+            displayOrder: 1,
+            createdAt: new Date("2026-01-02T00:00:00.000Z"),
+            id: "a-id",
+          }),
+        ];
+      }
+
+      return [];
+    });
+
+    const result = await resolveActiveWorldInfoBooks({
+      ownerId: "global",
+      chatId: "chat-1",
+      entityProfileId: "entity-1",
+      personaId: null,
+      settings: { insertionStrategy: 1, characterStrategy: 2 },
+    });
+
+    expect(result.orderedBindings.map((item) => item.bookId)).toEqual([
+      "book-same-order-a-a",
+      "book-same-order-a",
+      "book-same-order-a-z",
+      "book-same-order-b",
+      "book-late",
+    ]);
+  });
+});
diff --git a/server/src/services/world-info/world-info-bindings.ts b/server/src/services/world-info/world-info-bindings.ts
index 0d5e8193..4d3876b9 100644
--- a/server/src/services/world-info/world-info-bindings.ts
+++ b/server/src/services/world-info/world-info-bindings.ts
@@ -20,16 +20,6 @@ function sortBindings(items: WorldInfoBindingDto[]): WorldInfoBindingDto[] {
     });
 }
 
-function interleaveBindings(a: WorldInfoBindingDto[], b: WorldInfoBindingDto[]): WorldInfoBindingDto[] {
-  const result: WorldInfoBindingDto[] = [];
-  const maxLen = Math.max(a.length, b.length);
-  for (let i = 0; i < maxLen; i += 1) {
-    if (a[i]) result.push(a[i]);
-    if (b[i]) result.push(b[i]);
-  }
-  return result;
-}
-
 async function loadBindingsForScope(params: {
   ownerId: string;
   scope: WorldInfoScope;
@@ -71,18 +61,12 @@ export async function resolveActiveWorldInfoBooks(params: {
   const personaSorted = sortBindings(personaBindings);
   const globalSorted = sortBindings(globalBindings);
   const entitySorted = sortBindings(entityBindings);
-
-  let mixedGlobalEntity: WorldInfoBindingDto[] = [];
-  const insertionStrategy = params.settings.insertionStrategy ?? params.settings.characterStrategy;
-  if (insertionStrategy === 2) {
-    mixedGlobalEntity = [...globalSorted, ...entitySorted];
-  } else if (insertionStrategy === 1) {
-    mixedGlobalEntity = [...entitySorted, ...globalSorted];
-  } else {
-    mixedGlobalEntity = interleaveBindings(entitySorted, globalSorted);
-  }
-
-  const orderedBindings = [...chatSorted, ...personaSorted, ...mixedGlobalEntity];
+  const orderedBindings = [
+    ...globalSorted,
+    ...entitySorted,
+    ...personaSorted,
+    ...chatSorted,
+  ];
   const dedupedBindings: WorldInfoBindingDto[] = [];
   const seenBookIds = new Set<string>();
   for (const binding of orderedBindings) {
diff --git a/web/src/features/chat-window/input/chat-management-menu.tsx b/web/src/features/chat-window/input/chat-management-menu.tsx
index a519ceb8..26b7a697 100644
--- a/web/src/features/chat-window/input/chat-management-menu.tsx
+++ b/web/src/features/chat-window/input/chat-management-menu.tsx
@@ -2,7 +2,7 @@ import { ActionIcon, Badge, Box, Button, Checkbox, Group, Menu, Paper, Stack, Te
 import { useUnit } from 'effector-react';
 import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuBookOpenText, LuCheck, LuFolderGit2, LuMessageSquare, LuPencil, LuPlus, LuSettings2, LuTrash2, LuX } from 'react-icons/lu';
+import { LuBookMarked, LuBookOpenText, LuCheck, LuFolderGit2, LuMessageSquare, LuPencil, LuPlus, LuSettings2, LuTrash2, LuX } from 'react-icons/lu';
 
 import {
 	$branches,
@@ -28,6 +28,8 @@ import { Z_INDEX } from '@ui/z-index';
 
 import { getLatestWorldInfoActivations, type LatestWorldInfoActivationsResponse } from '../../../api/chat-entry-parts';
 
+import { ChatWorldInfoBindingDialog } from './chat-world-info-binding-dialog';
+
 function normalizeName(value: string): string {
 	return value.trim();
 }
@@ -52,6 +54,7 @@ export const ChatManagementMenu = () => {
 	const [deleteCurrentOnQuickCreate, setDeleteCurrentOnQuickCreate] = useState(false);
 	const [chatsModalOpen, setChatsModalOpen] = useState(false);
 	const [branchesModalOpen, setBranchesModalOpen] = useState(false);
+	const [chatWorldInfoModalOpen, setChatWorldInfoModalOpen] = useState(false);
 	const [worldInfoModalOpen, setWorldInfoModalOpen] = useState(false);
 	const [worldInfoLoading, setWorldInfoLoading] = useState(false);
 	const [worldInfoError, setWorldInfoError] = useState<string | null>(null);
@@ -179,12 +182,26 @@ export const ChatManagementMenu = () => {
 					>
 						{t('chat.management.bulkDelete')}
 					</Menu.Item>
+					<Menu.Item
+						leftSection={<LuBookMarked />}
+						disabled={!currentChatId}
+						onClick={() => setChatWorldInfoModalOpen(true)}
+					>
+						{t('chat.management.worldInfoBinding')}
+					</Menu.Item>
 					<Menu.Item leftSection={<LuBookOpenText />} disabled={!currentChatId} onClick={() => void loadLatestWorldInfoActivations()}>
 						{t('chat.management.latestWorldInfoActivations')}
 					</Menu.Item>
 				</Menu.Dropdown>
 			</Menu>
 
+			<ChatWorldInfoBindingDialog
+				opened={chatWorldInfoModalOpen}
+				onOpenChange={setChatWorldInfoModalOpen}
+				chatId={currentChatId}
+				chatTitle={currentChat?.title ?? null}
+			/>
+
 			<Dialog
 				open={quickCreateModalOpen}
 				onOpenChange={handleQuickCreateOpenChange}
diff --git a/web/src/features/chat-window/input/chat-world-info-binding-dialog.tsx b/web/src/features/chat-window/input/chat-world-info-binding-dialog.tsx
new file mode 100644
index 00000000..c58954b8
--- /dev/null
+++ b/web/src/features/chat-window/input/chat-world-info-binding-dialog.tsx
@@ -0,0 +1,96 @@
+import { Button, Select, Stack, Text } from '@mantine/core';
+import { useUnit } from 'effector-react';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { toggleSidebarOpen } from '@model/sidebars';
+import {
+	$worldInfoBooks,
+	$worldInfoCurrentChatBookId,
+	setWorldInfoBookBoundToCurrentChatFx,
+	setWorldInfoBookBoundToCurrentChatRequested,
+	worldInfoEditorOpenRequested,
+} from '@model/world-info';
+import { Dialog } from '@ui/dialog';
+
+type Props = {
+	opened: boolean;
+	onOpenChange: (open: boolean) => void;
+	chatId: string | null;
+	chatTitle: string | null;
+};
+
+export const ChatWorldInfoBindingDialog = ({ opened, onOpenChange, chatId, chatTitle }: Props) => {
+	const { t } = useTranslation();
+	const [books, currentBookId, bindingPending, bindBookToCurrentChat] = useUnit([
+		$worldInfoBooks,
+		$worldInfoCurrentChatBookId,
+		setWorldInfoBookBoundToCurrentChatFx.pending,
+		setWorldInfoBookBoundToCurrentChatRequested,
+	]);
+
+	const options = useMemo(
+		() => [{ value: '__none__', label: t('chat.management.worldInfoBindingNone') }, ...books.map((book) => ({ value: book.id, label: book.name }))],
+		[books, t],
+	);
+	const currentBook = useMemo(
+		() => books.find((book) => book.id === currentBookId) ?? null,
+		[books, currentBookId],
+	);
+
+	return (
+		<Dialog
+			open={opened}
+			onOpenChange={onOpenChange}
+			title={t('chat.management.worldInfoBindingTitle')}
+			size="sm"
+			footer={<></>}
+		>
+			<Stack gap="sm">
+				<Text size="sm" c="dimmed">
+					{chatTitle
+						? t('chat.management.worldInfoBindingForChat', { name: chatTitle })
+						: t('chat.management.selectChatFirst')}
+				</Text>
+				<Select
+					label={t('chat.management.worldInfoBindingLabel')}
+					value={currentBookId ?? '__none__'}
+					data={options}
+					disabled={!chatId || bindingPending}
+					comboboxProps={{ withinPortal: false }}
+					onChange={(value) => {
+						if (!chatId) return;
+						bindBookToCurrentChat({
+							chatId,
+							bookId: value === '__none__' ? null : value ?? null,
+						});
+					}}
+				/>
+				{currentBook ? (
+					<Stack gap={4}>
+						<Text size="sm" fw={600}>
+							{currentBook.name}
+						</Text>
+						<Text size="xs" c="dimmed">
+							slug: {currentBook.slug}
+						</Text>
+					</Stack>
+				) : (
+					<Text size="sm" c="dimmed">
+						{t('chat.management.worldInfoBindingNotBound')}
+					</Text>
+				)}
+				<Button
+					type="button"
+					variant="light"
+					onClick={() => {
+						toggleSidebarOpen({ name: 'worldInfo', isOpen: true });
+						worldInfoEditorOpenRequested({ bookId: currentBookId });
+					}}
+				>
+					{t('chat.management.worldInfoOpenSidebar')}
+				</Button>
+			</Stack>
+		</Dialog>
+	);
+};
diff --git a/web/src/features/sidebars/agent-cards/agent-card.tsx b/web/src/features/sidebars/agent-cards/agent-card.tsx
index 2055d43e..748d7184 100644
--- a/web/src/features/sidebars/agent-cards/agent-card.tsx
+++ b/web/src/features/sidebars/agent-cards/agent-card.tsx
@@ -16,12 +16,22 @@ type Props = {
 	isActive: boolean;
 	favoritePending: boolean;
 	worldInfoBookName: string | null;
+	onWorldInfoStatusAltClick: (profile: EntityProfileDto) => void;
 	onEdit: (profile: EntityProfileDto) => void;
 	onDelete: (profile: EntityProfileDto) => void;
 	onToggleFavorite: (profile: EntityProfileDto) => void;
 };
 
-export const AgentCard = ({ data, isActive, favoritePending, worldInfoBookName, onEdit, onDelete, onToggleFavorite }: Props) => {
+export const AgentCard = ({
+	data,
+	isActive,
+	favoritePending,
+	worldInfoBookName,
+	onWorldInfoStatusAltClick,
+	onEdit,
+	onDelete,
+	onToggleFavorite,
+}: Props) => {
 	const { t } = useTranslation();
 	const handleSelect = () => {
 		selectEntityProfile(data);
@@ -54,15 +64,24 @@ export const AgentCard = ({ data, isActive, favoritePending, worldInfoBookName,
 						<Text fw={600} truncate>
 							{data.name}
 						</Text>
-						{worldInfoBookName && (
-							<IconButtonWithTooltip
-								tooltip={t('agentCards.worldInfoBadgeTooltip', { name: worldInfoBookName })}
-								variant="subtle"
-								size="xs"
-								aria-label={t('agentCards.worldInfoBadgeAria')}
-								icon={<LuBookMarked />}
-							/>
-						)}
+						<IconButtonWithTooltip
+							tooltip={
+								worldInfoBookName
+									? t('agentCards.worldInfo.statusBoundTooltip', { name: worldInfoBookName })
+									: t('agentCards.worldInfo.statusUnboundTooltip')
+							}
+							variant={worldInfoBookName ? 'subtle' : 'outline'}
+							colorPalette={worldInfoBookName ? 'cyan' : 'gray'}
+							size="xs"
+							aria-label={t('agentCards.worldInfo.statusAria')}
+							onClick={(event) => {
+								event.preventDefault();
+								event.stopPropagation();
+								if (!event.altKey) return;
+								onWorldInfoStatusAltClick(data);
+							}}
+							icon={<LuBookMarked />}
+						/>
 						{isActive && (
 							<Badge size="xs" color="cyan" variant="light">
 								{t('agentCards.badges.active')}
diff --git a/web/src/features/sidebars/agent-cards/index.tsx b/web/src/features/sidebars/agent-cards/index.tsx
index c3e02e64..3869d641 100644
--- a/web/src/features/sidebars/agent-cards/index.tsx
+++ b/web/src/features/sidebars/agent-cards/index.tsx
@@ -574,6 +574,12 @@ export const AgentCardsSidebar = () => {
 								isActive={currentProfile?.id === item.profile.id}
 								favoritePending={updatePendingId === item.profile.id}
 								worldInfoBookName={worldInfoBookNameByProfileId[item.profile.id] ?? null}
+								onWorldInfoStatusAltClick={(profile) => {
+									toggleSidebarOpen({ name: 'worldInfo', isOpen: true });
+									worldInfoEditorOpenRequested({
+										bookId: worldInfoEntityBookByProfileId[profile.id] ?? null,
+									});
+								}}
 								onEdit={(profile) => setEditingProfileId(profile.id)}
 								onDelete={setProfileToDelete}
 								onToggleFavorite={(profile) => requestUpdate({ id: profile.id, isFavorite: !profile.isFavorite })}
diff --git a/web/src/features/sidebars/user-person/index.tsx b/web/src/features/sidebars/user-person/index.tsx
index 5733450e..f9bdd4f1 100644
--- a/web/src/features/sidebars/user-person/index.tsx
+++ b/web/src/features/sidebars/user-person/index.tsx
@@ -6,6 +6,12 @@ import { useTranslation } from 'react-i18next';
 import { LuPlus, LuSlidersHorizontal } from 'react-icons/lu';
 
 import { createEmptyUserPerson, userPersonsModel } from '@model/user-persons';
+import {
+	$worldInfoBooks,
+	$worldInfoPersonaBookByPersonaId,
+	loadWorldInfoBooksFx,
+	loadWorldInfoPersonaBindingsFx,
+} from '@model/world-info';
 import { Dialog } from '@ui/dialog';
 import { Drawer } from '@ui/drawer';
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
@@ -95,7 +101,14 @@ export const UserPersonSidebar: React.FC = () => {
 	}
 	const initialUiState = initialUiStateRef.current;
 
-	const [items, settings] = useUnit([userPersonsModel.$items, userPersonsModel.$settings]);
+	const [items, settings, worldInfoBooks, personaBookByPersonaId, loadWorldInfoBooks, loadWorldInfoPersonaBindings] = useUnit([
+		userPersonsModel.$items,
+		userPersonsModel.$settings,
+		$worldInfoBooks,
+		$worldInfoPersonaBookByPersonaId,
+		loadWorldInfoBooksFx,
+		loadWorldInfoPersonaBindingsFx,
+	]);
 	const [searchValue, setSearchValue] = useState(initialUiState.searchValue);
 	const [sortType, setSortType] = useState<SortType>(initialUiState.sortType);
 	const [advancedFiltersOpen, setAdvancedFiltersOpen] = useState(initialUiState.advancedFiltersOpen);
@@ -104,6 +117,11 @@ export const UserPersonSidebar: React.FC = () => {
 	const [editingPersonId, setEditingPersonId] = useState<string | null>(null);
 	const [deletingPerson, setDeletingPerson] = useState<UserPersonType | null>(null);
 
+	useEffect(() => {
+		void loadWorldInfoBooks();
+		void loadWorldInfoPersonaBindings();
+	}, [loadWorldInfoBooks, loadWorldInfoPersonaBindings]);
+
 	const sortOptions = useMemo(
 		() => [
 			{ value: 'A-Z', label: t('sortFilter.sort.alphaAsc') },
@@ -170,6 +188,15 @@ export const UserPersonSidebar: React.FC = () => {
 		if (!editingPersonId) return null;
 		return items.find((person) => person.id === editingPersonId) ?? null;
 	}, [editingPersonId, items]);
+	const worldInfoBookById = useMemo(() => new Map(worldInfoBooks.map((book) => [book.id, book])), [worldInfoBooks]);
+	const worldInfoBookNameByPersonaId = useMemo(() => {
+		return Object.fromEntries(
+			Object.entries(personaBookByPersonaId).map(([personaId, bookId]) => [
+				personaId,
+				bookId ? worldInfoBookById.get(bookId)?.name ?? null : null,
+			]),
+		) as Record<string, string | null>;
+	}, [personaBookByPersonaId, worldInfoBookById]);
 
 	const handleDeleteConfirm = async () => {
 		if (!deletingPerson) return;
@@ -280,6 +307,7 @@ export const UserPersonSidebar: React.FC = () => {
 									key={person.id}
 									data={person}
 									isActive={settings?.selectedId === person.id}
+									worldInfoBookName={worldInfoBookNameByPersonaId[person.id] ?? null}
 									onSelect={(selectedPerson) => userPersonsModel.updateSettingsFx({ selectedId: selectedPerson.id })}
 									onEdit={(selectedPerson) => setEditingPersonId(selectedPerson.id)}
 									onDelete={setDeletingPerson}
diff --git a/web/src/features/sidebars/user-person/user-person-card.tsx b/web/src/features/sidebars/user-person/user-person-card.tsx
index bf7c59f6..69d9fa42 100644
--- a/web/src/features/sidebars/user-person/user-person-card.tsx
+++ b/web/src/features/sidebars/user-person/user-person-card.tsx
@@ -2,7 +2,7 @@ import { Avatar, Group, Paper, Stack, Text } from '@mantine/core';
 import { type UserPersonType } from '@shared/types/user-person';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuPencil, LuTrash2 } from 'react-icons/lu';
+import { LuBookMarked, LuPencil, LuTrash2 } from 'react-icons/lu';
 
 import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 
@@ -11,12 +11,20 @@ import { BACKEND_ORIGIN } from '../../../api/chat-core';
 interface UserPersonCardProps {
 	data: UserPersonType;
 	isActive: boolean;
+	worldInfoBookName: string | null;
 	onSelect: (person: UserPersonType) => void;
 	onEdit: (person: UserPersonType) => void;
 	onDelete: (person: UserPersonType) => void;
 }
 
-export const UserPersonCard: React.FC<UserPersonCardProps> = ({ data, isActive, onSelect, onEdit, onDelete }) => {
+export const UserPersonCard: React.FC<UserPersonCardProps> = ({
+	data,
+	isActive,
+	worldInfoBookName,
+	onSelect,
+	onEdit,
+	onDelete,
+}) => {
 	const { t } = useTranslation();
 	const avatarUrl = data.avatarUrl ? `${BACKEND_ORIGIN}${data.avatarUrl}` : undefined;
 
@@ -41,6 +49,18 @@ export const UserPersonCard: React.FC<UserPersonCardProps> = ({ data, isActive,
 							<Text fw={700} truncate>
 								{data.name}
 							</Text>
+							<IconButtonWithTooltip
+								tooltip={
+									worldInfoBookName
+										? t('userPersons.worldInfo.statusBoundTooltip', { name: worldInfoBookName })
+										: t('userPersons.worldInfo.statusUnboundTooltip')
+								}
+								variant={worldInfoBookName ? 'subtle' : 'outline'}
+								colorPalette={worldInfoBookName ? 'cyan' : 'gray'}
+								size="xs"
+								aria-label={t('userPersons.worldInfo.statusAria')}
+								icon={<LuBookMarked />}
+							/>
 							{isActive && (
 								<Text c="cyan" size="xs" fw={600}>
 									{t('userPersons.badges.active')}
diff --git a/web/src/features/sidebars/user-person/user-person-editor.tsx b/web/src/features/sidebars/user-person/user-person-editor.tsx
index c0216629..bf02b75c 100644
--- a/web/src/features/sidebars/user-person/user-person-editor.tsx
+++ b/web/src/features/sidebars/user-person/user-person-editor.tsx
@@ -28,6 +28,7 @@ import {
 	createAdditionalItem,
 	normalizeContentTypeExtended,
 } from './additional-description-utils';
+import { UserPersonWorldInfoSection } from './user-person-world-info-section';
 
 interface UserPersonEditorProps {
 	opened: boolean;
@@ -381,6 +382,8 @@ export const UserPersonEditor: React.FC<UserPersonEditorProps> = ({ opened, data
 							</Stack>
 						</Paper>
 
+						<UserPersonWorldInfoSection personaId={data.id} />
+
 						<Paper withBorder p="md" radius="md">
 							<Stack gap="sm">
 								<Group
diff --git a/web/src/features/sidebars/user-person/user-person-world-info-section.tsx b/web/src/features/sidebars/user-person/user-person-world-info-section.tsx
new file mode 100644
index 00000000..4792da68
--- /dev/null
+++ b/web/src/features/sidebars/user-person/user-person-world-info-section.tsx
@@ -0,0 +1,82 @@
+import { Button, Paper, Select, Stack, Text } from '@mantine/core';
+import { useUnit } from 'effector-react';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { toggleSidebarOpen } from '@model/sidebars';
+import {
+	$worldInfoBooks,
+	$worldInfoPersonaBookByPersonaId,
+	setWorldInfoBookBoundToPersonaFx,
+	setWorldInfoBookBoundToPersonaRequested,
+	worldInfoEditorOpenRequested,
+} from '@model/world-info';
+
+type Props = {
+	personaId: string;
+};
+
+export const UserPersonWorldInfoSection = ({ personaId }: Props) => {
+	const { t } = useTranslation();
+	const [books, bookByPersonaId, bindingPending, bindBookToPersona] = useUnit([
+		$worldInfoBooks,
+		$worldInfoPersonaBookByPersonaId,
+		setWorldInfoBookBoundToPersonaFx.pending,
+		setWorldInfoBookBoundToPersonaRequested,
+	]);
+
+	const selectedBookId = bookByPersonaId[personaId] ?? null;
+	const selectedBook = useMemo(
+		() => books.find((book) => book.id === selectedBookId) ?? null,
+		[books, selectedBookId],
+	);
+	const options = useMemo(
+		() => [{ value: '__none__', label: t('userPersons.worldInfo.none') }, ...books.map((book) => ({ value: book.id, label: book.name }))],
+		[books, t],
+	);
+
+	return (
+		<Paper withBorder p="md" radius="md">
+			<Stack gap="sm">
+				<Text fw={600}>{t('userPersons.worldInfo.title')}</Text>
+				<Select
+					label={t('userPersons.worldInfo.bindingLabel')}
+					value={selectedBookId ?? '__none__'}
+					data={options}
+					disabled={bindingPending}
+					comboboxProps={{ withinPortal: false }}
+					onChange={(value) =>
+						bindBookToPersona({
+							personaId,
+							bookId: value === '__none__' ? null : value ?? null,
+						})
+					}
+				/>
+				{selectedBook ? (
+					<Stack gap={4}>
+						<Text size="sm" fw={600}>
+							{selectedBook.name}
+						</Text>
+						<Text size="xs" c="dimmed">
+							slug: {selectedBook.slug}
+						</Text>
+					</Stack>
+				) : (
+					<Text size="sm" c="dimmed">
+						{t('userPersons.worldInfo.notBound')}
+					</Text>
+				)}
+				<Button
+					type="button"
+					variant="light"
+					onClick={() => {
+						toggleSidebarOpen({ name: 'worldInfo', isOpen: true });
+						worldInfoEditorOpenRequested({ bookId: selectedBookId });
+					}}
+				>
+					{t('userPersons.worldInfo.openEditor')}
+				</Button>
+			</Stack>
+		</Paper>
+	);
+};
diff --git a/web/src/features/sidebars/world-info/index.tsx b/web/src/features/sidebars/world-info/index.tsx
index 40a5651d..1b002034 100644
--- a/web/src/features/sidebars/world-info/index.tsx
+++ b/web/src/features/sidebars/world-info/index.tsx
@@ -1,13 +1,12 @@
-import { Accordion, Button, Group, NumberInput, Select, Stack, Switch, Text } from '@mantine/core';
+import { Accordion, Button, Group, NumberInput, Paper, Select, Stack, Switch, Text } from '@mantine/core';
 import { useMediaQuery } from '@mantine/hooks';
 import { useUnit } from 'effector-react';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { LuCopy, LuPencilLine, LuPlus, LuRefreshCw, LuTrash2 } from 'react-icons/lu';
 
-import { $currentChat } from '@model/chat-core';
 import {
-	$isWorldInfoBookBoundToCurrentChat,
+	$worldInfoGlobalBookId,
 	$worldInfoEditorLaunch,
 	$selectedWorldInfoBook,
 	$selectedWorldInfoBookId,
@@ -18,11 +17,11 @@ import {
 	duplicateWorldInfoBookFx,
 	importWorldInfoBookFx,
 	loadWorldInfoBooksFx,
-	loadWorldInfoChatBindingsFx,
+	loadWorldInfoGlobalBindingsFx,
 	loadWorldInfoSettingsFx,
 	saveWorldInfoBookFx,
 	saveWorldInfoSettingsFx,
-	worldInfoBookBindingToggleRequested,
+	setWorldInfoBookBoundToGlobalRequested,
 	worldInfoBookCreateRequested,
 	worldInfoBookDeleteRequested,
 	worldInfoBookDuplicateRequested,
@@ -51,13 +50,12 @@ export const WorldInfoSidebar = () => {
 	const [editorOpen, setEditorOpen] = useState(false);
 	const isMobile = useMediaQuery('(max-width: 48em)');
 
-	const [books, selectedId, selectedBook, settings, isBoundToCurrentChat, currentChat, worldInfoEditorLaunch] = useUnit([
+	const [books, selectedId, selectedBook, settings, globalBookId, worldInfoEditorLaunch] = useUnit([
 		$worldInfoBooks,
 		$selectedWorldInfoBookId,
 		$selectedWorldInfoBook,
 		$worldInfoSettings,
-		$isWorldInfoBookBoundToCurrentChat,
-		$currentChat,
+		$worldInfoGlobalBookId,
 		$worldInfoEditorLaunch,
 	]);
 
@@ -88,10 +86,8 @@ export const WorldInfoSidebar = () => {
 
 	useEffect(() => {
 		if (worldInfoEditorLaunch.nonce === 0) return;
-		if (worldInfoEditorLaunch.bookId) {
-			worldInfoBookSelected(worldInfoEditorLaunch.bookId);
-		}
-		setEditorOpen(true);
+		worldInfoBookSelected(worldInfoEditorLaunch.bookId);
+		setEditorOpen(Boolean(worldInfoEditorLaunch.bookId));
 	}, [worldInfoEditorLaunch]);
 
 	const [isCreatePending, isDuplicatePending, isDeletePending, isSaveBookPending, isSaveSettingsPending, isImportPending] = useUnit([
@@ -106,6 +102,14 @@ export const WorldInfoSidebar = () => {
 		isCreatePending || isDuplicatePending || isDeletePending || isSaveBookPending || isSaveSettingsPending || isImportPending;
 
 	const bookOptions = useMemo(() => books.map((item) => ({ value: item.id, label: item.name })), [books]);
+	const globalBindingOptions = useMemo(
+		() => [{ value: '__none__', label: t('worldInfo.globalBinding.none') }, ...bookOptions],
+		[bookOptions, t],
+	);
+	const globalBoundBook = useMemo(
+		() => books.find((item) => item.id === globalBookId) ?? null,
+		[books, globalBookId],
+	);
 
 	const handleSaveSettings = () => {
 		if (!settingsDraft) return;
@@ -208,9 +212,7 @@ export const WorldInfoSidebar = () => {
 								onClick={() => {
 									void loadWorldInfoBooksFx();
 									void loadWorldInfoSettingsFx();
-									if (currentChat?.id) {
-										void loadWorldInfoChatBindingsFx({ chatId: currentChat.id });
-									}
+									void loadWorldInfoGlobalBindingsFx();
 								}}
 							/>
 							<IconButtonWithTooltip
@@ -230,6 +232,40 @@ export const WorldInfoSidebar = () => {
 						</Group>
 					</Group>
 
+					<Paper withBorder p="md" radius="md">
+						<Stack gap="sm">
+							<Text size="sm" fw={600}>
+								{t('worldInfo.globalBinding.title')}
+							</Text>
+							<Select
+								label={t('worldInfo.globalBinding.label')}
+								value={globalBookId ?? '__none__'}
+								data={globalBindingOptions}
+								disabled={isBusy}
+								comboboxProps={{ withinPortal: false }}
+								onChange={(value) =>
+									setWorldInfoBookBoundToGlobalRequested({
+										bookId: value === '__none__' ? null : value ?? null,
+									})
+								}
+							/>
+							{globalBoundBook ? (
+								<Stack gap={4}>
+									<Text size="sm" fw={600}>
+										{globalBoundBook.name}
+									</Text>
+									<Text size="xs" c="dimmed">
+										slug: {globalBoundBook.slug}
+									</Text>
+								</Stack>
+							) : (
+								<Text size="sm" c="dimmed">
+									{t('worldInfo.globalBinding.notBound')}
+								</Text>
+							)}
+						</Stack>
+					</Paper>
+
 					{!selectedBook ? (
 						<Text c="dimmed" size="sm">{t('sidebars.selectBookToEdit')}</Text>
 					) : (
@@ -238,13 +274,6 @@ export const WorldInfoSidebar = () => {
 							<Text size="xs" c="dimmed">slug: {selectedBook.slug}</Text>
 							{selectedBook.description && <Text size="sm" c="dimmed">{selectedBook.description}</Text>}
 
-							<Switch
-								label={currentChat ? t('worldInfo.fields.bindToChat', { chatTitle: currentChat.title }) : t('worldInfo.fields.noActiveChat')}
-								checked={isBoundToCurrentChat}
-								disabled={!currentChat}
-								onChange={(event) => worldInfoBookBindingToggleRequested({ bookId: selectedBook.id, enabled: event.currentTarget.checked })}
-							/>
-
 							<Button leftSection={<LuPencilLine />} onClick={() => setEditorOpen(true)}>
 								{t('worldInfo.actions.openEditor')}
 							</Button>
diff --git a/web/src/i18n/resources/en/agentCards.ts b/web/src/i18n/resources/en/agentCards.ts
index 42ed5e19..71ae5505 100644
--- a/web/src/i18n/resources/en/agentCards.ts
+++ b/web/src/i18n/resources/en/agentCards.ts
@@ -1,8 +1,6 @@
 const enAgentCards = {
 			kindLabel: 'Type: {{kind}}',
 			tokensApprox: '~{{count}} tok',
-			worldInfoBadgeTooltip: 'World Info: {{name}}',
-			worldInfoBadgeAria: 'Profile has linked World Info',
 			badges: {
 				active: 'Active',
 			},
@@ -18,6 +16,9 @@
 				notBound: 'No World Info linked for this profile.',
 				bindingLabel: 'Linked World Info book',
 				openEditor: 'Open World Info editor',
+				statusAria: 'World Info status',
+				statusBoundTooltip: 'World Info: {{name}}. Alt+click to open.',
+				statusUnboundTooltip: 'No linked World Info. Alt+click to open the sidebar.',
 			},
 			actions: {
 				favorite: 'Add to favorites',
diff --git a/web/src/i18n/resources/en/chat.ts b/web/src/i18n/resources/en/chat.ts
index dd0d46da..a400bede 100644
--- a/web/src/i18n/resources/en/chat.ts
+++ b/web/src/i18n/resources/en/chat.ts
@@ -26,6 +26,13 @@
 				manageChats: 'Manage chats',
 				manageBranches: 'Manage branches',
 				bulkDelete: 'Delete messages',
+				worldInfoBinding: 'Chat World Info',
+				worldInfoBindingTitle: 'Chat World Info',
+				worldInfoBindingForChat: 'Binding for chat "{{name}}"',
+				worldInfoBindingLabel: 'Linked World Info book',
+				worldInfoBindingNone: 'Not linked',
+				worldInfoBindingNotBound: 'No World Info linked for this chat.',
+				worldInfoOpenSidebar: 'Open World Info sidebar',
 				latestWorldInfoActivations: 'Latest World Info activations',
 				latestWorldInfoActivationsTitle: 'Latest World Info activations',
 				latestWorldInfoLoading: 'Loading activations…',
diff --git a/web/src/i18n/resources/en/userPersons.ts b/web/src/i18n/resources/en/userPersons.ts
index 33bb8385..fa9b3c48 100644
--- a/web/src/i18n/resources/en/userPersons.ts
+++ b/web/src/i18n/resources/en/userPersons.ts
@@ -37,6 +37,16 @@ const enUserPersons = {
 		title: 'Final description preview',
 		info: 'Enabled additional blocks: {{count}}',
 	},
+	worldInfo: {
+		title: 'World Info',
+		none: 'Not linked',
+		notBound: 'No World Info linked for this persona.',
+		bindingLabel: 'Linked World Info book',
+		openEditor: 'Open World Info editor',
+		statusAria: 'World Info status',
+		statusBoundTooltip: 'World Info: {{name}}',
+		statusUnboundTooltip: 'No linked World Info',
+	},
 	badges: {
 		active: 'Active',
 	},
diff --git a/web/src/i18n/resources/en/worldInfo.ts b/web/src/i18n/resources/en/worldInfo.ts
index 5dbb4895..85c699e1 100644
--- a/web/src/i18n/resources/en/worldInfo.ts
+++ b/web/src/i18n/resources/en/worldInfo.ts
@@ -4,8 +4,12 @@
 				slug: 'Slug',
 				description: 'Description',
 				bookDataJson: 'Book data JSON',
-				bindToChat: 'Bind to chat: {{chatTitle}}',
-				noActiveChat: 'No active chat to bind',
+			},
+			globalBinding: {
+				title: 'Global binding',
+				label: 'Global World Info book',
+				none: 'Not linked',
+				notBound: 'No global World Info book is linked.',
 			},
 			actions: {
 				createBook: 'Create World Info book',
@@ -140,7 +144,7 @@
 				saveBookErrorTitle: 'Failed to save book',
 				settingsSaved: 'World Info settings saved',
 				saveSettingsErrorTitle: 'Failed to save settings',
-				bindingUpdated: 'Chat binding updated',
+				bindingUpdated: 'World Info binding updated',
 				bindingUpdateErrorTitle: 'Failed to update binding',
 				importedBook: 'Imported {{name}}{{warningSuffix}}',
 				importErrorTitle: 'Failed to import book',
diff --git a/web/src/i18n/resources/ru/agentCards.ts b/web/src/i18n/resources/ru/agentCards.ts
index 0fc1b9b7..059ac3af 100644
--- a/web/src/i18n/resources/ru/agentCards.ts
+++ b/web/src/i18n/resources/ru/agentCards.ts
@@ -1,8 +1,6 @@
 const ruAgentCards = {
 			kindLabel: 'Тип: {{kind}}',
 			tokensApprox: '~{{count}} ток.',
-			worldInfoBadgeTooltip: 'World Info: {{name}}',
-			worldInfoBadgeAria: 'У профиля есть связанный World Info',
 			badges: {
 				active: 'Активный',
 			},
@@ -18,6 +16,9 @@
 				notBound: 'Для этого профиля World Info не привязан.',
 				bindingLabel: 'Привязанная книга World Info',
 				openEditor: 'Открыть редактор World Info',
+				statusAria: 'Статус World Info',
+				statusBoundTooltip: 'World Info: {{name}}. Alt+клик для открытия.',
+				statusUnboundTooltip: 'World Info не привязан. Alt+клик для открытия сайдбара.',
 			},
 			actions: {
 				favorite: 'В избранное',
diff --git a/web/src/i18n/resources/ru/chat.ts b/web/src/i18n/resources/ru/chat.ts
index 1e556d6e..39a64288 100644
--- a/web/src/i18n/resources/ru/chat.ts
+++ b/web/src/i18n/resources/ru/chat.ts
@@ -26,6 +26,13 @@
 				manageChats: 'Управление чатами',
 				manageBranches: 'Управление ветками',
 				bulkDelete: 'Удаление сообщений',
+				worldInfoBinding: 'World Info чата',
+				worldInfoBindingTitle: 'World Info чата',
+				worldInfoBindingForChat: 'Привязка для чата "{{name}}"',
+				worldInfoBindingLabel: 'Привязанная книга World Info',
+				worldInfoBindingNone: 'Не привязано',
+				worldInfoBindingNotBound: 'Для этого чата World Info не привязан.',
+				worldInfoOpenSidebar: 'Открыть sidebar World Info',
 				latestWorldInfoActivations: 'Последние активации World Info',
 				latestWorldInfoActivationsTitle: 'Последние активации World Info',
 				latestWorldInfoLoading: 'Загрузка активаций…',
diff --git a/web/src/i18n/resources/ru/userPersons.ts b/web/src/i18n/resources/ru/userPersons.ts
index ea1cc2cd..47e1a702 100644
--- a/web/src/i18n/resources/ru/userPersons.ts
+++ b/web/src/i18n/resources/ru/userPersons.ts
@@ -37,6 +37,16 @@ const ruUserPersons = {
 		title: 'Превью итогового описания',
 		info: 'Включенных дополнительных блоков: {{count}}',
 	},
+	worldInfo: {
+		title: 'World Info',
+		none: 'Не привязано',
+		notBound: 'Для этой персоны World Info не привязан.',
+		bindingLabel: 'Привязанная книга World Info',
+		openEditor: 'Открыть редактор World Info',
+		statusAria: 'Статус World Info',
+		statusBoundTooltip: 'World Info: {{name}}',
+		statusUnboundTooltip: 'World Info не привязан',
+	},
 	badges: {
 		active: 'Активная',
 	},
diff --git a/web/src/i18n/resources/ru/worldInfo.ts b/web/src/i18n/resources/ru/worldInfo.ts
index 38f0e2e8..513d0464 100644
--- a/web/src/i18n/resources/ru/worldInfo.ts
+++ b/web/src/i18n/resources/ru/worldInfo.ts
@@ -4,8 +4,12 @@
 				slug: 'Slug',
 				description: 'Описание',
 				bookDataJson: 'Book data JSON',
-				bindToChat: 'Привязать к чату: {{chatTitle}}',
-				noActiveChat: 'Нет активного чата для привязки',
+			},
+			globalBinding: {
+				title: 'Глобальная привязка',
+				label: 'Глобальная книга World Info',
+				none: 'Не привязано',
+				notBound: 'Глобальная книга World Info не привязана.',
 			},
 			actions: {
 				createBook: 'Создать книгу World Info',
@@ -140,7 +144,7 @@
 				saveBookErrorTitle: 'Не удалось сохранить книгу',
 				settingsSaved: 'Настройки World Info сохранены',
 				saveSettingsErrorTitle: 'Не удалось сохранить настройки',
-				bindingUpdated: 'Привязка к чату обновлена',
+				bindingUpdated: 'Привязка World Info обновлена',
 				bindingUpdateErrorTitle: 'Не удалось обновить привязку',
 				importedBook: 'Импортирован {{name}}{{warningSuffix}}',
 				importErrorTitle: 'Не удалось импортировать книгу',
diff --git a/web/src/model/world-info/binding-utils.test.ts b/web/src/model/world-info/binding-utils.test.ts
new file mode 100644
index 00000000..745284de
--- /dev/null
+++ b/web/src/model/world-info/binding-utils.test.ts
@@ -0,0 +1,127 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+	buildSingleBindingItems,
+	createCanonicalBookMapByScopeId,
+	pickCanonicalBinding,
+	sortBindingsByCanonicalOrder,
+} from './binding-utils';
+
+import type { WorldInfoBindingDto } from '../../api/world-info';
+
+function makeBinding(
+	id: string,
+	patch: Partial<WorldInfoBindingDto> = {},
+): WorldInfoBindingDto {
+	return {
+		id,
+		ownerId: 'global',
+		scope: 'entity_profile',
+		scopeId: 'scope-1',
+		bookId: `${id}-book`,
+		bindingRole: 'primary',
+		displayOrder: 0,
+		enabled: true,
+		meta: null,
+		createdAt: '2026-01-01T00:00:00.000Z',
+		updatedAt: '2026-01-01T00:00:00.000Z',
+		...patch,
+	};
+}
+
+describe('world-info binding utils', () => {
+	it('sorts bindings by displayOrder, createdAt, and id while skipping disabled entries for canonical pick', () => {
+		const result = pickCanonicalBinding([
+			makeBinding('disabled-first', {
+				bookId: 'book-disabled',
+				displayOrder: 0,
+				enabled: false,
+			}),
+			makeBinding('later', {
+				bookId: 'book-later',
+				displayOrder: 2,
+			}),
+			makeBinding('same-order-z', {
+				bookId: 'book-z',
+				displayOrder: 1,
+				createdAt: '2026-01-02T00:00:00.000Z',
+				id: 'z-id',
+			}),
+			makeBinding('same-order-a', {
+				bookId: 'book-a',
+				displayOrder: 1,
+				createdAt: '2026-01-02T00:00:00.000Z',
+				id: 'a-id',
+			}),
+		]);
+
+		expect(result?.bookId).toBe('book-a');
+		expect(sortBindingsByCanonicalOrder([
+			makeBinding('same-order-z', {
+				bookId: 'book-z',
+				displayOrder: 1,
+				createdAt: '2026-01-02T00:00:00.000Z',
+				id: 'z-id',
+			}),
+			makeBinding('later', {
+				bookId: 'book-later',
+				displayOrder: 2,
+			}),
+			makeBinding('same-order-a', {
+				bookId: 'book-a',
+				displayOrder: 1,
+				createdAt: '2026-01-02T00:00:00.000Z',
+				id: 'a-id',
+			}),
+		]).map((item) => item.bookId)).toEqual(['book-a', 'book-z', 'book-later']);
+	});
+
+	it('creates a canonical single-book map per scope id', () => {
+		expect(createCanonicalBookMapByScopeId([
+			makeBinding('entity-1-second', {
+				scopeId: 'entity-1',
+				bookId: 'book-entity-1-second',
+				displayOrder: 1,
+			}),
+			makeBinding('entity-2-only', {
+				scopeId: 'entity-2',
+				bookId: 'book-entity-2-only',
+				displayOrder: 0,
+			}),
+			makeBinding('entity-1-first', {
+				scopeId: 'entity-1',
+				bookId: 'book-entity-1-first',
+				displayOrder: 0,
+			}),
+			makeBinding('entity-2-disabled', {
+				scopeId: 'entity-2',
+				bookId: 'book-entity-2-disabled',
+				displayOrder: -1,
+				enabled: false,
+			}),
+		])).toEqual({
+			'entity-1': 'book-entity-1-first',
+			'entity-2': 'book-entity-2-only',
+		});
+	});
+
+	it('builds zero-or-one replacement payloads for scope writes', () => {
+		expect(buildSingleBindingItems(null)).toEqual([]);
+		expect(buildSingleBindingItems('book-1')).toEqual([
+			{
+				bookId: 'book-1',
+				bindingRole: 'primary',
+				displayOrder: 0,
+				enabled: true,
+			},
+		]);
+		expect(buildSingleBindingItems('book-2', 'additional')).toEqual([
+			{
+				bookId: 'book-2',
+				bindingRole: 'additional',
+				displayOrder: 0,
+				enabled: true,
+			},
+		]);
+	});
+});
diff --git a/web/src/model/world-info/binding-utils.ts b/web/src/model/world-info/binding-utils.ts
new file mode 100644
index 00000000..090110cb
--- /dev/null
+++ b/web/src/model/world-info/binding-utils.ts
@@ -0,0 +1,66 @@
+import type { WorldInfoBindingDto, WorldInfoBindingRole } from '../../api/world-info';
+
+function toTimestamp(value: string): number {
+	const parsed = Date.parse(value);
+	return Number.isFinite(parsed) ? parsed : 0;
+}
+
+export function sortBindingsByCanonicalOrder(
+	items: WorldInfoBindingDto[],
+): WorldInfoBindingDto[] {
+	return items.slice().sort((a, b) => {
+		if (a.displayOrder !== b.displayOrder) return a.displayOrder - b.displayOrder;
+		const aCreatedAt = toTimestamp(a.createdAt);
+		const bCreatedAt = toTimestamp(b.createdAt);
+		if (aCreatedAt !== bCreatedAt) return aCreatedAt - bCreatedAt;
+		return a.id.localeCompare(b.id);
+	});
+}
+
+export function pickCanonicalBinding(
+	items: WorldInfoBindingDto[],
+): WorldInfoBindingDto | null {
+	return sortBindingsByCanonicalOrder(items.filter((item) => item.enabled))[0] ?? null;
+}
+
+export function createCanonicalBookMapByScopeId(
+	items: WorldInfoBindingDto[],
+): Record<string, string | null> {
+	const grouped = new Map<string, WorldInfoBindingDto[]>();
+
+	items.forEach((item) => {
+		if (!item.scopeId) return;
+		const group = grouped.get(item.scopeId) ?? [];
+		group.push(item);
+		grouped.set(item.scopeId, group);
+	});
+
+	return Array.from(grouped.entries()).reduce<Record<string, string | null>>(
+		(acc, [scopeId, bindings]) => {
+			acc[scopeId] = pickCanonicalBinding(bindings)?.bookId ?? null;
+			return acc;
+		},
+		{},
+	);
+}
+
+export function buildSingleBindingItems(
+	bookId: string | null,
+	bindingRole: WorldInfoBindingRole = 'primary',
+): Array<{
+	bookId: string;
+	bindingRole: WorldInfoBindingRole;
+	displayOrder: number;
+	enabled: boolean;
+}> {
+	if (!bookId) return [];
+
+	return [
+		{
+			bookId,
+			bindingRole,
+			displayOrder: 0,
+			enabled: true,
+		},
+	];
+}
diff --git a/web/src/model/world-info/index.ts b/web/src/model/world-info/index.ts
index 59e27134..3dfd16da 100644
--- a/web/src/model/world-info/index.ts
+++ b/web/src/model/world-info/index.ts
@@ -16,12 +16,15 @@ import {
 	type WorldInfoBookData,
 	type WorldInfoBookDto,
 	type WorldInfoBookSummaryDto,
+	type WorldInfoScope,
 	type WorldInfoSettingsDto,
 } from '../../api/world-info';
 import i18n from '../../i18n';
 import { toaster } from '../../ui/toaster';
 import { $currentChat, setOpenedChat } from '../chat-core';
 
+import { buildSingleBindingItems, createCanonicalBookMapByScopeId, pickCanonicalBinding } from './binding-utils';
+
 import type { ChatDto } from '../../api/chat-core';
 
 const DEFAULT_OWNER_ID = 'global';
@@ -31,6 +34,44 @@ const DEFAULT_BOOK_DATA: WorldInfoBookData = {
 	extensions: {},
 };
 
+type ScopeBindingParams = {
+	scope: WorldInfoScope;
+	scopeId?: string | null;
+	bookId: string | null;
+};
+
+type EntityBindingParams = {
+	entityProfileId: string;
+	bookId: string | null;
+	silent?: boolean;
+};
+
+type PersonaBindingParams = {
+	personaId: string;
+	bookId: string | null;
+	silent?: boolean;
+};
+
+async function replaceSingleBinding(params: ScopeBindingParams): Promise<WorldInfoBindingDto[]> {
+	return replaceWorldInfoBindings({
+		ownerId: DEFAULT_OWNER_ID,
+		scope: params.scope,
+		scopeId: params.scopeId,
+		items: buildSingleBindingItems(params.bookId),
+	});
+}
+
+function showBindingSuccessToast(): void {
+	toaster.success({ title: i18n.t('worldInfo.toasts.bindingUpdated') });
+}
+
+function showBindingErrorToast(error: unknown): void {
+	toaster.error({
+		title: i18n.t('worldInfo.toasts.bindingUpdateErrorTitle'),
+		description: error instanceof Error ? error.message : String(error),
+	});
+}
+
 export const worldInfoRefreshRequested = createEvent();
 export const worldInfoBookSelected = createEvent<string | null>();
 export const worldInfoBookCreateRequested = createEvent();
@@ -47,14 +88,12 @@ export const worldInfoBookSaveRequested = createEvent<{
 export const worldInfoSettingsSaveRequested = createEvent<{
 	patch: Partial<Omit<WorldInfoSettingsDto, 'ownerId' | 'createdAt' | 'updatedAt'>>;
 }>();
-export const worldInfoBookBindingToggleRequested = createEvent<{ bookId: string; enabled: boolean }>();
 export const worldInfoImportBookRequested = createEvent<{ file: File }>();
 export const worldInfoEditorOpenRequested = createEvent<{ bookId: string | null }>();
-export const setWorldInfoBookBoundToEntityRequested = createEvent<{
-	entityProfileId: string;
-	bookId: string | null;
-	silent?: boolean;
-}>();
+export const setWorldInfoBookBoundToGlobalRequested = createEvent<{ bookId: string | null }>();
+export const setWorldInfoBookBoundToCurrentChatRequested = createEvent<{ chatId: string; bookId: string | null }>();
+export const setWorldInfoBookBoundToEntityRequested = createEvent<EntityBindingParams>();
+export const setWorldInfoBookBoundToPersonaRequested = createEvent<PersonaBindingParams>();
 
 export const loadWorldInfoBooksFx = createEffect(async (): Promise<WorldInfoBookSummaryDto[]> => {
 	const response = await listWorldInfoBooks({ ownerId: DEFAULT_OWNER_ID, limit: 200 });
@@ -69,6 +108,13 @@ export const loadWorldInfoSettingsFx = createEffect(async (): Promise<WorldInfoS
 	return getWorldInfoSettings(DEFAULT_OWNER_ID);
 });
 
+export const loadWorldInfoGlobalBindingsFx = createEffect(async (): Promise<WorldInfoBindingDto[]> => {
+	return listWorldInfoBindings({
+		ownerId: DEFAULT_OWNER_ID,
+		scope: 'global',
+	});
+});
+
 export const loadWorldInfoChatBindingsFx = createEffect(async (params: { chatId: string }): Promise<WorldInfoBindingDto[]> => {
 	return listWorldInfoBindings({
 		ownerId: DEFAULT_OWNER_ID,
@@ -84,6 +130,13 @@ export const loadWorldInfoEntityBindingsFx = createEffect(async (): Promise<Worl
 	});
 });
 
+export const loadWorldInfoPersonaBindingsFx = createEffect(async (): Promise<WorldInfoBindingDto[]> => {
+	return listWorldInfoBindings({
+		ownerId: DEFAULT_OWNER_ID,
+		scope: 'persona',
+	});
+});
+
 export const createWorldInfoBookFx = createEffect(async (): Promise<WorldInfoBookDto> => {
 	return createWorldInfoBook({
 		ownerId: DEFAULT_OWNER_ID,
@@ -120,96 +173,41 @@ export const saveWorldInfoSettingsFx = createEffect(
 	},
 );
 
-export const setWorldInfoBookBoundToCurrentChatFx = createEffect(
-	async (params: { chatId: string; bookId: string; enabled: boolean }): Promise<WorldInfoBindingDto[]> => {
-		const existing = await listWorldInfoBindings({
-			ownerId: DEFAULT_OWNER_ID,
-			scope: 'chat',
-			scopeId: params.chatId,
-		});
+export const setWorldInfoBookBoundToGlobalFx = createEffect(async (params: { bookId: string | null }) => {
+	return replaceSingleBinding({
+		scope: 'global',
+		bookId: params.bookId,
+	});
+});
 
-		const byBookId = new Map(existing.map((item) => [item.bookId, item]));
-		const ordered = existing
-			.slice()
-			.sort((a, b) => a.displayOrder - b.displayOrder)
-			.map((item) => ({
-				bookId: item.bookId,
-				bindingRole: item.bindingRole,
-				displayOrder: item.displayOrder,
-				enabled: item.enabled,
-			}));
-
-		if (byBookId.has(params.bookId)) {
-			const next = ordered.map((item) =>
-				item.bookId === params.bookId
-					? {
-						...item,
-						enabled: params.enabled,
-					}
-					: item,
-			);
-			const normalized = next.map((item, idx) => ({ ...item, displayOrder: idx }));
-			return replaceWorldInfoBindings({
-				ownerId: DEFAULT_OWNER_ID,
-				scope: 'chat',
-				scopeId: params.chatId,
-				items: normalized,
-			});
-		}
-
-		if (!params.enabled) {
-			return existing;
-		}
-
-		const normalized = [
-			...ordered,
-			{
-				bookId: params.bookId,
-				bindingRole: 'additional' as const,
-				displayOrder: ordered.length,
-				enabled: true,
-			},
-		].map((item, idx) => ({ ...item, displayOrder: idx }));
-
-		return replaceWorldInfoBindings({
-			ownerId: DEFAULT_OWNER_ID,
-			scope: 'chat',
-			scopeId: params.chatId,
-			items: normalized,
-		});
-	},
-);
+export const setWorldInfoBookBoundToCurrentChatFx = createEffect(async (params: { chatId: string; bookId: string | null }) => {
+	return replaceSingleBinding({
+		scope: 'chat',
+		scopeId: params.chatId,
+		bookId: params.bookId,
+	});
+});
+
+export const setWorldInfoBookBoundToEntityFx = createEffect(async (params: EntityBindingParams): Promise<WorldInfoBindingDto[]> => {
+	return replaceSingleBinding({
+		scope: 'entity_profile',
+		scopeId: params.entityProfileId,
+		bookId: params.bookId,
+	});
+});
+
+export const setWorldInfoBookBoundToPersonaFx = createEffect(async (params: PersonaBindingParams): Promise<WorldInfoBindingDto[]> => {
+	return replaceSingleBinding({
+		scope: 'persona',
+		scopeId: params.personaId,
+		bookId: params.bookId,
+	});
+});
 
 export const importWorldInfoBookFx = createEffect(async (params: { file: File }) => {
 	return importWorldInfoBook({ file: params.file, ownerId: DEFAULT_OWNER_ID, format: 'auto' });
 });
 
-export const setWorldInfoBookBoundToEntityFx = createEffect(
-	async (params: {
-		entityProfileId: string;
-		bookId: string | null;
-		silent?: boolean;
-	}): Promise<WorldInfoBindingDto[]> => {
-		const items =
-			typeof params.bookId === 'string' && params.bookId.trim().length > 0
-				? [
-					{
-						bookId: params.bookId,
-						bindingRole: 'primary' as const,
-						displayOrder: 0,
-						enabled: true,
-					},
-				]
-				: [];
-		return replaceWorldInfoBindings({
-			ownerId: DEFAULT_OWNER_ID,
-			scope: 'entity_profile',
-			scopeId: params.entityProfileId,
-			items,
-		});
-	},
-);
-
 export const $worldInfoBooks = createStore<WorldInfoBookSummaryDto[]>([]).on(loadWorldInfoBooksFx.doneData, (_, items) => items);
 
 export const $selectedWorldInfoBookId = createStore<string | null>(null).on(worldInfoBookSelected, (_, id) => id);
@@ -232,47 +230,41 @@ export const $worldInfoSettings = createStore<WorldInfoSettingsDto | null>(null)
 	.on(loadWorldInfoSettingsFx.doneData, (_, settings) => settings)
 	.on(saveWorldInfoSettingsFx.doneData, (_, settings) => settings);
 
+export const $worldInfoGlobalBindings = createStore<WorldInfoBindingDto[]>([])
+	.on(loadWorldInfoGlobalBindingsFx.doneData, (_, items) => items)
+	.on(setWorldInfoBookBoundToGlobalFx.doneData, (_, items) => items);
+
 export const $worldInfoChatBindings = createStore<WorldInfoBindingDto[]>([])
 	.on(loadWorldInfoChatBindingsFx.doneData, (_, items) => items)
 	.on(setWorldInfoBookBoundToCurrentChatFx.doneData, (_, items) => items);
 
-export const $worldInfoEntityBindings = createStore<WorldInfoBindingDto[]>(
-	[],
-).on(loadWorldInfoEntityBindingsFx.doneData, (_, items) => items);
-
-export const $worldInfoEntityBookByProfileId = createStore<Record<string, string | null>>({}).on(
-	$worldInfoEntityBindings,
-	(_, bindings) => {
-		const grouped: Record<string, WorldInfoBindingDto[]> = {};
-		bindings.forEach((binding) => {
-			if (!binding.enabled || !binding.scopeId) return;
-			if (!grouped[binding.scopeId]) {
-				grouped[binding.scopeId] = [];
-			}
-			grouped[binding.scopeId].push(binding);
-		});
+export const $worldInfoEntityBindings = createStore<WorldInfoBindingDto[]>([])
+	.on(loadWorldInfoEntityBindingsFx.doneData, (_, items) => items);
 
-		const map: Record<string, string | null> = {};
-		Object.keys(grouped).forEach((profileId) => {
-			const sorted = grouped[profileId].slice().sort((a, b) => a.displayOrder - b.displayOrder);
-			map[profileId] = sorted[0]?.bookId ?? null;
-		});
-		return map;
-	},
-);
+export const $worldInfoPersonaBindings = createStore<WorldInfoBindingDto[]>([])
+	.on(loadWorldInfoPersonaBindingsFx.doneData, (_, items) => items);
+
+export const $worldInfoGlobalBookId = $worldInfoGlobalBindings.map((bindings) => pickCanonicalBinding(bindings)?.bookId ?? null);
 
-export const $isWorldInfoBookBoundToCurrentChat = combine(
+export const $worldInfoCurrentChatBookId = combine(
+	$currentChat,
 	$worldInfoChatBindings,
-	$selectedWorldInfoBookId,
-	(bindings, selectedBookId) => {
-		if (!selectedBookId) return false;
-		return bindings.some((item) => item.bookId === selectedBookId && item.enabled);
-	},
+	(chat, bindings) => (chat ? pickCanonicalBinding(bindings)?.bookId ?? null : null),
 );
 
+export const $worldInfoEntityBookByProfileId = $worldInfoEntityBindings.map((bindings) => createCanonicalBookMapByScopeId(bindings));
+
+export const $worldInfoPersonaBookByPersonaId = $worldInfoPersonaBindings.map((bindings) => createCanonicalBookMapByScopeId(bindings));
+
 sample({
 	clock: worldInfoRefreshRequested,
-	target: [loadWorldInfoBooksFx, loadWorldInfoSettingsFx, loadWorldInfoEntityBindingsFx],
+	target: [
+		loadWorldInfoBooksFx,
+		loadWorldInfoSettingsFx,
+		loadWorldInfoGlobalBindingsFx,
+		loadWorldInfoEntityBindingsFx,
+		loadWorldInfoPersonaBindingsFx,
+	],
 });
 
 sample({
@@ -340,7 +332,15 @@ sample({
 
 sample({
 	clock: [deleteWorldInfoBookFx.doneData, importWorldInfoBookFx.doneData],
-	target: loadWorldInfoEntityBindingsFx,
+	target: [loadWorldInfoGlobalBindingsFx, loadWorldInfoEntityBindingsFx, loadWorldInfoPersonaBindingsFx],
+});
+
+sample({
+	clock: [deleteWorldInfoBookFx.doneData, importWorldInfoBookFx.doneData],
+	source: $currentChat,
+	filter: (chat): chat is ChatDto => Boolean(chat?.id),
+	fn: (chat) => ({ chatId: chat!.id }),
+	target: loadWorldInfoChatBindingsFx,
 });
 
 sample({
@@ -355,14 +355,12 @@ sample({
 });
 
 sample({
-	clock: worldInfoBookBindingToggleRequested,
-	source: $currentChat,
-	filter: (chat): chat is ChatDto => Boolean(chat?.id),
-	fn: (chat, payload) => ({
-		chatId: chat!.id,
-		bookId: payload.bookId,
-		enabled: payload.enabled,
-	}),
+	clock: setWorldInfoBookBoundToGlobalRequested,
+	target: setWorldInfoBookBoundToGlobalFx,
+});
+
+sample({
+	clock: setWorldInfoBookBoundToCurrentChatRequested,
 	target: setWorldInfoBookBoundToCurrentChatFx,
 });
 
@@ -371,11 +369,21 @@ sample({
 	target: setWorldInfoBookBoundToEntityFx,
 });
 
+sample({
+	clock: setWorldInfoBookBoundToPersonaRequested,
+	target: setWorldInfoBookBoundToPersonaFx,
+});
+
 sample({
 	clock: setWorldInfoBookBoundToEntityFx.doneData,
 	target: loadWorldInfoEntityBindingsFx,
 });
 
+sample({
+	clock: setWorldInfoBookBoundToPersonaFx.doneData,
+	target: loadWorldInfoPersonaBindingsFx,
+});
+
 createWorldInfoBookFx.failData.watch((error) => {
 	toaster.error({ title: i18n.t('worldInfo.toasts.createErrorTitle'), description: error instanceof Error ? error.message : String(error) });
 });
@@ -404,22 +412,40 @@ saveWorldInfoSettingsFx.failData.watch((error) => {
 	toaster.error({ title: i18n.t('worldInfo.toasts.saveSettingsErrorTitle'), description: error instanceof Error ? error.message : String(error) });
 });
 
-setWorldInfoBookBoundToCurrentChatFx.doneData.watch(() => {
-	toaster.success({ title: i18n.t('worldInfo.toasts.bindingUpdated') });
+setWorldInfoBookBoundToGlobalFx.doneData.watch(() => {
+	showBindingSuccessToast();
 });
 
-setWorldInfoBookBoundToCurrentChatFx.failData.watch((error) => {
-	toaster.error({ title: i18n.t('worldInfo.toasts.bindingUpdateErrorTitle'), description: error instanceof Error ? error.message : String(error) });
+setWorldInfoBookBoundToCurrentChatFx.doneData.watch(() => {
+	showBindingSuccessToast();
 });
 
 setWorldInfoBookBoundToEntityFx.done.watch(({ params }) => {
 	if (params.silent) return;
-	toaster.success({ title: i18n.t('worldInfo.toasts.bindingUpdated') });
+	showBindingSuccessToast();
+});
+
+setWorldInfoBookBoundToPersonaFx.done.watch(({ params }) => {
+	if (params.silent) return;
+	showBindingSuccessToast();
+});
+
+setWorldInfoBookBoundToGlobalFx.failData.watch((error) => {
+	showBindingErrorToast(error);
+});
+
+setWorldInfoBookBoundToCurrentChatFx.failData.watch((error) => {
+	showBindingErrorToast(error);
 });
 
 setWorldInfoBookBoundToEntityFx.fail.watch(({ params, error }) => {
 	if (params.silent) return;
-	toaster.error({ title: i18n.t('worldInfo.toasts.bindingUpdateErrorTitle'), description: error instanceof Error ? error.message : String(error) });
+	showBindingErrorToast(error);
+});
+
+setWorldInfoBookBoundToPersonaFx.fail.watch(({ params, error }) => {
+	if (params.silent) return;
+	showBindingErrorToast(error);
 });
 
 importWorldInfoBookFx.doneData.watch((result) => {

From 038a4e72c766c03aa4dee00cfb9a3cc89097c416 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Tue, 17 Mar 2026 23:55:37 +0300
Subject: [PATCH 24/54] fix: up

---
 .../backgrounds/default-bg.png                | Bin
 default/backgrounds/manifest.json             |   9 +
 server/drizzle/0030_app_backgrounds.sql       |  10 +
 server/drizzle/meta/_journal.json             |   7 +
 server/src/api/_routes_.ts                    |   2 +
 .../src/api/app-backgrounds.core.api.test.ts  |  30 +
 server/src/api/app-backgrounds.core.api.ts    | 112 +++
 server/src/api/static.api.ts                  |  15 +
 server/src/db/schema.ts                       |   1 +
 server/src/db/schema/app-backgrounds.ts       |   9 +
 server/src/db/schema/ui.ts                    |   1 +
 server/src/e2e/full-matrix-extra.e2e.spec.ts  |  69 ++
 .../app-backgrounds-manifest.ts               |  57 ++
 .../app-backgrounds-repository.test.ts        |  91 +++
 .../app-backgrounds-repository.ts             | 198 ++++++
 shared/types/app-background.ts                |  18 +
 web/src/App.tsx                               |   8 +-
 web/src/api/app-backgrounds.ts                |  61 ++
 web/src/features/chat-window/index.tsx        |   4 +-
 .../sidebars/app-settings/backgrounds-tab.tsx | 187 +++++
 .../sidebars/app-settings/debug-tab.tsx       |  94 +++
 .../sidebars/app-settings/general-tab.tsx     |  45 ++
 .../features/sidebars/app-settings/index.tsx  | 643 +-----------------
 .../app-settings/theme-preset-accordion.tsx   | 261 +++++++
 .../app-settings/theme-preset-editor.tsx      |  53 ++
 .../sidebars/app-settings/theming-tab.tsx     | 227 +++++++
 .../features/sidebars/app-settings/types.ts   |   1 +
 web/src/i18n/resources/en/appSettings.ts      |  31 +
 web/src/i18n/resources/ru/appSettings.ts      |  31 +
 web/src/index.css                             |   3 +
 web/src/model/app-backgrounds/helpers.test.ts |  32 +
 web/src/model/app-backgrounds/helpers.ts      |  13 +
 web/src/model/app-backgrounds/index.ts        | 111 +++
 web/src/model/app-init.ts                     |   2 +
 34 files changed, 1803 insertions(+), 633 deletions(-)
 rename web/src/assets/bg.png => default/backgrounds/default-bg.png (100%)
 create mode 100644 default/backgrounds/manifest.json
 create mode 100644 server/drizzle/0030_app_backgrounds.sql
 create mode 100644 server/src/api/app-backgrounds.core.api.test.ts
 create mode 100644 server/src/api/app-backgrounds.core.api.ts
 create mode 100644 server/src/db/schema/app-backgrounds.ts
 create mode 100644 server/src/services/app-backgrounds/app-backgrounds-manifest.ts
 create mode 100644 server/src/services/app-backgrounds/app-backgrounds-repository.test.ts
 create mode 100644 server/src/services/app-backgrounds/app-backgrounds-repository.ts
 create mode 100644 shared/types/app-background.ts
 create mode 100644 web/src/api/app-backgrounds.ts
 create mode 100644 web/src/features/sidebars/app-settings/backgrounds-tab.tsx
 create mode 100644 web/src/features/sidebars/app-settings/debug-tab.tsx
 create mode 100644 web/src/features/sidebars/app-settings/general-tab.tsx
 create mode 100644 web/src/features/sidebars/app-settings/theme-preset-accordion.tsx
 create mode 100644 web/src/features/sidebars/app-settings/theme-preset-editor.tsx
 create mode 100644 web/src/features/sidebars/app-settings/theming-tab.tsx
 create mode 100644 web/src/features/sidebars/app-settings/types.ts
 create mode 100644 web/src/model/app-backgrounds/helpers.test.ts
 create mode 100644 web/src/model/app-backgrounds/helpers.ts
 create mode 100644 web/src/model/app-backgrounds/index.ts

diff --git a/web/src/assets/bg.png b/default/backgrounds/default-bg.png
similarity index 100%
rename from web/src/assets/bg.png
rename to default/backgrounds/default-bg.png
diff --git a/default/backgrounds/manifest.json b/default/backgrounds/manifest.json
new file mode 100644
index 00000000..353571ae
--- /dev/null
+++ b/default/backgrounds/manifest.json
@@ -0,0 +1,9 @@
+{
+  "items": [
+    {
+      "id": "builtin:default",
+      "name": "Default background",
+      "fileName": "default-bg.png"
+    }
+  ]
+}
diff --git a/server/drizzle/0030_app_backgrounds.sql b/server/drizzle/0030_app_backgrounds.sql
new file mode 100644
index 00000000..0b03147d
--- /dev/null
+++ b/server/drizzle/0030_app_backgrounds.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `ui_app_backgrounds` (
+	`id` text PRIMARY KEY NOT NULL,
+	`name` text NOT NULL,
+	`file_name` text NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE `ui_app_settings`
+ADD COLUMN `active_app_background_id` text;
diff --git a/server/drizzle/meta/_journal.json b/server/drizzle/meta/_journal.json
index 7947e0bb..3d9f0b10 100644
--- a/server/drizzle/meta/_journal.json
+++ b/server/drizzle/meta/_journal.json
@@ -183,6 +183,13 @@
       "when": 1773100000000,
       "tag": "0029_instruction_kinds",
       "breakpoints": true
+    },
+    {
+      "idx": 26,
+      "version": "7",
+      "when": 1773200000000,
+      "tag": "0030_app_backgrounds",
+      "breakpoints": true
     }
   ]
 }
diff --git a/server/src/api/_routes_.ts b/server/src/api/_routes_.ts
index ab5b9a60..cd57b20f 100644
--- a/server/src/api/_routes_.ts
+++ b/server/src/api/_routes_.ts
@@ -1,3 +1,4 @@
+import appBackgroundsRoutes from "./app-backgrounds.core.api";
 import appSettingsRoutes from "./app-settings.api";
 import bundlesCoreRoutes from "./bundles.core.api";
 import chatEntriesRoutes from "./chat-entries.api";
@@ -37,6 +38,7 @@ export const routes = [
   modelsRoutes,
   settingsRoutes,
   appSettingsRoutes,
+  appBackgroundsRoutes,
   generateRoutes,
   sidebarsRoutes,
   ragRoutes,
diff --git a/server/src/api/app-backgrounds.core.api.test.ts b/server/src/api/app-backgrounds.core.api.test.ts
new file mode 100644
index 00000000..954416c3
--- /dev/null
+++ b/server/src/api/app-backgrounds.core.api.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, test } from "vitest";
+
+import { appBackgroundActiveBodySchema } from "./app-backgrounds.core.api";
+
+describe("app background route schemas", () => {
+  test("accepts active background id patch", () => {
+    const parsed = appBackgroundActiveBodySchema.safeParse({
+      activeBackgroundId: "builtin:mist",
+    });
+
+    expect(parsed.success).toBe(true);
+  });
+
+  test("accepts clearing active background id", () => {
+    const parsed = appBackgroundActiveBodySchema.safeParse({
+      activeBackgroundId: null,
+    });
+
+    expect(parsed.success).toBe(true);
+  });
+
+  test("rejects unknown patch keys", () => {
+    const parsed = appBackgroundActiveBodySchema.safeParse({
+      activeBackgroundId: "builtin:mist",
+      injected: true,
+    });
+
+    expect(parsed.success).toBe(false);
+  });
+});
diff --git a/server/src/api/app-backgrounds.core.api.ts b/server/src/api/app-backgrounds.core.api.ts
new file mode 100644
index 00000000..699772c1
--- /dev/null
+++ b/server/src/api/app-backgrounds.core.api.ts
@@ -0,0 +1,112 @@
+import path from "node:path";
+
+import express, { type Request } from "express";
+import multer from "multer";
+import { z } from "zod";
+
+import { asyncHandler } from "@core/middleware/async-handler";
+import { HttpError } from "@core/middleware/error-handler";
+import { validate } from "@core/middleware/validate";
+
+import {
+  deleteAppBackground,
+  getAppBackgroundCatalog,
+  importAppBackground,
+  setAppBackgroundActive,
+} from "../services/app-backgrounds/app-backgrounds-repository";
+
+const router = express.Router();
+
+const allowedMimesByExtension: Record<string, readonly string[]> = {
+  ".png": ["image/png"],
+  ".jpg": ["image/jpeg"],
+  ".jpeg": ["image/jpeg"],
+  ".gif": ["image/gif"],
+  ".webp": ["image/webp"],
+  ".svg": ["image/svg+xml"],
+};
+
+function normalizeMimeType(mimeType: string): string {
+  return String(mimeType ?? "")
+    .toLowerCase()
+    .split(";")[0]
+    .trim();
+}
+
+function isAllowedImageType(params: { originalName: string; mimeType: string }): boolean {
+  const extension = path.extname(params.originalName).toLowerCase();
+  const allowedMimes = allowedMimesByExtension[extension];
+  if (!allowedMimes) return false;
+  return allowedMimes.includes(normalizeMimeType(params.mimeType));
+}
+
+const upload = multer({
+  storage: multer.memoryStorage(),
+  limits: {
+    fileSize: 10 * 1024 * 1024,
+  },
+  fileFilter: (_req, file, cb) => {
+    if (isAllowedImageType({ originalName: file.originalname, mimeType: file.mimetype })) {
+      return cb(null, true);
+    }
+    cb(new Error("Unsupported file type"));
+  },
+});
+
+const idParamsSchema = z
+  .object({
+    id: z.string().min(1),
+  })
+  .strict();
+
+export const appBackgroundActiveBodySchema = z
+  .object({
+    activeBackgroundId: z.string().min(1).nullable(),
+  })
+  .strict();
+
+router.get(
+  "/app-backgrounds",
+  asyncHandler(async () => {
+    const data = await getAppBackgroundCatalog();
+    return { data };
+  })
+);
+
+router.post(
+  "/app-backgrounds/import",
+  upload.single("image"),
+  asyncHandler(async (req: Request) => {
+    if (!req.file) {
+      throw new HttpError(400, "Image is required", "VALIDATION_ERROR");
+    }
+
+    const data = await importAppBackground({
+      fileBuffer: req.file.buffer,
+      originalName: req.file.originalname,
+    });
+    return { data };
+  })
+);
+
+router.put(
+  "/app-backgrounds/active",
+  validate({ body: appBackgroundActiveBodySchema }),
+  asyncHandler(async (req: Request) => {
+    const body = appBackgroundActiveBodySchema.parse(req.body);
+    const data = await setAppBackgroundActive(body);
+    return { data };
+  })
+);
+
+router.delete(
+  "/app-backgrounds/:id",
+  validate({ params: idParamsSchema }),
+  asyncHandler(async (req: Request) => {
+    const params = idParamsSchema.parse(req.params);
+    const data = await deleteAppBackground({ id: params.id });
+    return { data };
+  })
+);
+
+export default router;
diff --git a/server/src/api/static.api.ts b/server/src/api/static.api.ts
index 11aff365..49b7dc70 100644
--- a/server/src/api/static.api.ts
+++ b/server/src/api/static.api.ts
@@ -2,6 +2,7 @@ import path from "path";
 
 import express from "express";
 
+import { resolveMonorepoRoot } from "../config/path-resolver";
 import { createDataPath } from "../utils";
 
 const router = express.Router();
@@ -32,4 +33,18 @@ router.use(
   })
 );
 
+router.use(
+  "/defaults/backgrounds",
+  express.static(path.join(resolveMonorepoRoot(), "default", "backgrounds"), {
+    maxAge: "1d",
+    setHeaders: (res, filePath) => {
+      const ext = path.extname(filePath).toLowerCase();
+      const mimeType = mimeTypes[ext];
+      if (mimeType) {
+        res.setHeader("Content-Type", mimeType);
+      }
+    },
+  })
+);
+
 export default router;
diff --git a/server/src/db/schema.ts b/server/src/db/schema.ts
index 01941818..991ee776 100644
--- a/server/src/db/schema.ts
+++ b/server/src/db/schema.ts
@@ -5,6 +5,7 @@ export * from "./schema/instructions";
 export * from "./schema/operation-profiles";
 export * from "./schema/llm";
 export * from "./schema/rag";
+export * from "./schema/app-backgrounds";
 export * from "./schema/ui";
 export * from "./schema/ui-theme";
 export * from "./schema/user-persons";
diff --git a/server/src/db/schema/app-backgrounds.ts b/server/src/db/schema/app-backgrounds.ts
new file mode 100644
index 00000000..b60b1b46
--- /dev/null
+++ b/server/src/db/schema/app-backgrounds.ts
@@ -0,0 +1,9 @@
+import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
+
+export const uiAppBackgrounds = sqliteTable("ui_app_backgrounds", {
+  id: text("id").primaryKey(),
+  name: text("name").notNull(),
+  fileName: text("file_name").notNull(),
+  createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
+  updatedAt: integer("updated_at", { mode: "timestamp_ms" }).notNull(),
+});
diff --git a/server/src/db/schema/ui.ts b/server/src/db/schema/ui.ts
index 07269154..1a911c99 100644
--- a/server/src/db/schema/ui.ts
+++ b/server/src/db/schema/ui.ts
@@ -13,6 +13,7 @@ export const uiAppSettings = sqliteTable("ui_app_settings", {
   autoSelectCurrentPersona: integer("auto_select_current_persona", { mode: "boolean" })
     .notNull()
     .default(false),
+  activeAppBackgroundId: text("active_app_background_id"),
   bindChatCompletionPresetToConnection: integer(
     "bind_chat_completion_preset_to_connection",
     { mode: "boolean" }
diff --git a/server/src/e2e/full-matrix-extra.e2e.spec.ts b/server/src/e2e/full-matrix-extra.e2e.spec.ts
index b62f2635..b1664824 100644
--- a/server/src/e2e/full-matrix-extra.e2e.spec.ts
+++ b/server/src/e2e/full-matrix-extra.e2e.spec.ts
@@ -430,4 +430,73 @@ describe("backend e2e full matrix extra", () => {
 
     expectApiSuccess(await requestJson({ baseUrl, method: "GET", path: `/api/entries/${meta.assistantEntryId}/prompt-diagnostics` }));
   });
+
+  test("app backgrounds lifecycle", async () => {
+    const baseUrl = appServer!.baseUrl;
+
+    const initialCatalog = expectApiSuccess<{
+      items: Array<{ id: string; source: string; deletable: boolean }>;
+      activeBackgroundId: string | null;
+    }>(await requestJson({ baseUrl, method: "GET", path: "/api/app-backgrounds" }));
+
+    expect(initialCatalog.items.some((item) => item.id === "builtin:default")).toBe(true);
+    expect(initialCatalog.activeBackgroundId).toBe("builtin:default");
+
+    expectApiError(
+      await requestJson({
+        baseUrl,
+        method: "DELETE",
+        path: "/api/app-backgrounds/builtin%3Adefault",
+      }),
+      400,
+      "VALIDATION_ERROR"
+    );
+
+    const uploadForm = new FormData();
+    uploadForm.append("image", new Blob([Buffer.from(PNG_1X1_BASE64, "base64")], { type: "image/png" }), "app-bg.png");
+    const uploaded = expectApiSuccess<{ id: string; name: string; deletable: boolean }>(
+      await requestForm({
+        baseUrl,
+        method: "POST",
+        path: "/api/app-backgrounds/import",
+        form: uploadForm,
+      })
+    );
+
+    expect(uploaded.id.startsWith("upload:")).toBe(true);
+    expect(uploaded.deletable).toBe(true);
+
+    expectApiSuccess(
+      await requestJson({
+        baseUrl,
+        method: "PUT",
+        path: "/api/app-backgrounds/active",
+        body: { activeBackgroundId: uploaded.id },
+      })
+    );
+
+    const selectedCatalog = expectApiSuccess<{
+      items: Array<{ id: string }>;
+      activeBackgroundId: string | null;
+    }>(await requestJson({ baseUrl, method: "GET", path: "/api/app-backgrounds" }));
+    expect(selectedCatalog.items.some((item) => item.id === uploaded.id)).toBe(true);
+    expect(selectedCatalog.activeBackgroundId).toBe(uploaded.id);
+
+    const deleted = expectApiSuccess<{ deletedId: string; activeBackgroundId: string | null }>(
+      await requestJson({
+        baseUrl,
+        method: "DELETE",
+        path: `/api/app-backgrounds/${encodeURIComponent(uploaded.id)}`,
+      })
+    );
+    expect(deleted.deletedId).toBe(uploaded.id);
+    expect(deleted.activeBackgroundId).toBe("builtin:default");
+
+    const finalCatalog = expectApiSuccess<{
+      items: Array<{ id: string }>;
+      activeBackgroundId: string | null;
+    }>(await requestJson({ baseUrl, method: "GET", path: "/api/app-backgrounds" }));
+    expect(finalCatalog.items.some((item) => item.id === uploaded.id)).toBe(false);
+    expect(finalCatalog.activeBackgroundId).toBe("builtin:default");
+  });
 });
diff --git a/server/src/services/app-backgrounds/app-backgrounds-manifest.ts b/server/src/services/app-backgrounds/app-backgrounds-manifest.ts
new file mode 100644
index 00000000..1c0afd1e
--- /dev/null
+++ b/server/src/services/app-backgrounds/app-backgrounds-manifest.ts
@@ -0,0 +1,57 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+
+import { z } from "zod";
+
+import { resolveMonorepoRoot } from "../../config/path-resolver";
+
+import type { AppBackgroundAsset } from "@shared/types/app-background";
+
+const backgroundManifestSchema = z
+  .object({
+    items: z
+      .array(
+        z
+          .object({
+            id: z.string().min(1),
+            name: z.string().min(1).max(256),
+            fileName: z.string().min(1),
+          })
+          .strict()
+      )
+      .min(1),
+  })
+  .strict();
+
+export function resolveBuiltInBackgroundsDir(monorepoRoot: string = resolveMonorepoRoot()): string {
+  return path.join(monorepoRoot, "default", "backgrounds");
+}
+
+function toBuiltInImageUrl(fileName: string): string {
+  return `/defaults/backgrounds/${encodeURIComponent(fileName)}`;
+}
+
+export async function loadBuiltInAppBackgrounds(params?: {
+  monorepoRoot?: string;
+}): Promise<AppBackgroundAsset[]> {
+  const monorepoRoot = params?.monorepoRoot ?? resolveMonorepoRoot();
+  const backgroundsDir = resolveBuiltInBackgroundsDir(monorepoRoot);
+  const manifestPath = path.join(backgroundsDir, "manifest.json");
+  const parsed = backgroundManifestSchema.parse(
+    JSON.parse(await fs.readFile(manifestPath, "utf8")) as unknown
+  );
+
+  await Promise.all(
+    parsed.items.map(async (item) => {
+      await fs.access(path.join(backgroundsDir, item.fileName));
+    })
+  );
+
+  return parsed.items.map((item) => ({
+    id: item.id,
+    name: item.name,
+    source: "builtin" as const,
+    imageUrl: toBuiltInImageUrl(item.fileName),
+    deletable: false,
+  }));
+}
diff --git a/server/src/services/app-backgrounds/app-backgrounds-repository.test.ts b/server/src/services/app-backgrounds/app-backgrounds-repository.test.ts
new file mode 100644
index 00000000..f89892be
--- /dev/null
+++ b/server/src/services/app-backgrounds/app-backgrounds-repository.test.ts
@@ -0,0 +1,91 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { describe, expect, test } from "vitest";
+
+import {
+  loadBuiltInAppBackgrounds,
+  mergeAppBackgroundAssets,
+  resolveActiveBackgroundId,
+} from "./app-backgrounds-repository";
+
+import type { AppBackgroundAsset } from "@shared/types/app-background";
+
+describe("app-backgrounds-repository", () => {
+  test("loads built-in backgrounds from manifest", async () => {
+    const rootDir = await fs.mkdtemp(path.join(os.tmpdir(), "ts-app-backgrounds-"));
+    const backgroundsDir = path.join(rootDir, "default", "backgrounds");
+
+    await fs.mkdir(backgroundsDir, { recursive: true });
+    await fs.writeFile(path.join(backgroundsDir, "mist.png"), "fixture");
+    await fs.writeFile(
+      path.join(backgroundsDir, "manifest.json"),
+      JSON.stringify({
+        items: [
+          {
+            id: "builtin:mist",
+            name: "Mist",
+            fileName: "mist.png",
+          },
+        ],
+      })
+    );
+
+    await expect(loadBuiltInAppBackgrounds({ monorepoRoot: rootDir })).resolves.toEqual([
+      {
+        id: "builtin:mist",
+        name: "Mist",
+        source: "builtin",
+        imageUrl: "/defaults/backgrounds/mist.png",
+        deletable: false,
+      },
+    ]);
+
+    await fs.rm(rootDir, { recursive: true, force: true });
+  });
+
+  test("merges built-in assets before uploaded assets", () => {
+    const builtIns: AppBackgroundAsset[] = [
+      {
+        id: "builtin:mist",
+        name: "Mist",
+        source: "builtin",
+        imageUrl: "/defaults/backgrounds/mist.png",
+        deletable: false,
+      },
+    ];
+    const uploads: AppBackgroundAsset[] = [
+      {
+        id: "upload:123",
+        name: "User Mist",
+        source: "uploaded",
+        imageUrl: "/media/images/app-backgrounds/user-mist.png",
+        deletable: true,
+      },
+    ];
+
+    expect(mergeAppBackgroundAssets(builtIns, uploads)).toEqual([...builtIns, ...uploads]);
+  });
+
+  test("falls back to first built-in background when active id is missing", () => {
+    const items: AppBackgroundAsset[] = [
+      {
+        id: "builtin:mist",
+        name: "Mist",
+        source: "builtin",
+        imageUrl: "/defaults/backgrounds/mist.png",
+        deletable: false,
+      },
+      {
+        id: "upload:123",
+        name: "User Mist",
+        source: "uploaded",
+        imageUrl: "/media/images/app-backgrounds/user-mist.png",
+        deletable: true,
+      },
+    ];
+
+    expect(resolveActiveBackgroundId({ activeBackgroundId: "upload:missing", items })).toBe("builtin:mist");
+  });
+});
diff --git a/server/src/services/app-backgrounds/app-backgrounds-repository.ts b/server/src/services/app-backgrounds/app-backgrounds-repository.ts
new file mode 100644
index 00000000..fec2db52
--- /dev/null
+++ b/server/src/services/app-backgrounds/app-backgrounds-repository.ts
@@ -0,0 +1,198 @@
+import { randomUUID } from "node:crypto";
+import fs from "node:fs/promises";
+import path from "node:path";
+
+import { eq } from "drizzle-orm";
+
+import { resolveSafePath } from "@core/files/safe-path";
+import { HttpError } from "@core/middleware/error-handler";
+
+import { initDb } from "../../db/client";
+import { uiAppBackgrounds, uiAppSettings } from "../../db/schema";
+import { createDataPath } from "../../utils";
+import { getAppSettings } from "../app-settings/app-settings-repository";
+
+import { loadBuiltInAppBackgrounds } from "./app-backgrounds-manifest";
+
+import type {
+  AppBackgroundActiveSelection,
+  AppBackgroundAsset,
+  AppBackgroundCatalog,
+} from "@shared/types/app-background";
+
+const SETTINGS_ROW_ID = "global";
+const APP_BACKGROUNDS_FOLDER = createDataPath("media", "images", "app-backgrounds");
+
+type AppBackgroundRow = typeof uiAppBackgrounds.$inferSelect;
+
+function rowToAsset(row: AppBackgroundRow): AppBackgroundAsset {
+  return {
+    id: row.id,
+    name: row.name,
+    source: "uploaded",
+    imageUrl: `/media/images/app-backgrounds/${encodeURIComponent(row.fileName)}`,
+    deletable: true,
+  };
+}
+
+function resolveUploadedBackgroundName(originalName: string): string {
+  const baseName = path.basename(originalName, path.extname(originalName)).trim();
+  return baseName.length > 0 ? baseName : "Imported background";
+}
+
+async function ensureSettingsRow(): Promise<void> {
+  await getAppSettings();
+}
+
+async function listUploadedBackgrounds(): Promise<AppBackgroundAsset[]> {
+  const db = await initDb();
+  const rows = await db.select().from(uiAppBackgrounds);
+  return rows.map(rowToAsset);
+}
+
+async function readStoredActiveBackgroundId(): Promise<string | null> {
+  await ensureSettingsRow();
+  const db = await initDb();
+  const rows = await db
+    .select({ activeAppBackgroundId: uiAppSettings.activeAppBackgroundId })
+    .from(uiAppSettings)
+    .where(eq(uiAppSettings.id, SETTINGS_ROW_ID))
+    .limit(1);
+  return rows[0]?.activeAppBackgroundId ?? null;
+}
+
+async function persistActiveBackgroundId(activeBackgroundId: string | null): Promise<void> {
+  await ensureSettingsRow();
+  const db = await initDb();
+  await db
+    .update(uiAppSettings)
+    .set({
+      activeAppBackgroundId: activeBackgroundId,
+      updatedAt: new Date(),
+    })
+    .where(eq(uiAppSettings.id, SETTINGS_ROW_ID));
+}
+
+export function mergeAppBackgroundAssets(
+  builtInAssets: AppBackgroundAsset[],
+  uploadedAssets: AppBackgroundAsset[]
+): AppBackgroundAsset[] {
+  return [...builtInAssets, ...uploadedAssets];
+}
+
+export function resolveActiveBackgroundId(params: {
+  activeBackgroundId: string | null;
+  items: AppBackgroundAsset[];
+}): string | null {
+  const activeItem = params.activeBackgroundId
+    ? params.items.find((item) => item.id === params.activeBackgroundId)
+    : null;
+  if (activeItem) return activeItem.id;
+
+  const builtIn = params.items.find((item) => item.source === "builtin");
+  if (builtIn) return builtIn.id;
+
+  return params.items[0]?.id ?? null;
+}
+
+export { loadBuiltInAppBackgrounds };
+
+export async function getAppBackgroundCatalog(): Promise<AppBackgroundCatalog> {
+  const [builtIns, uploads, storedActiveBackgroundId] = await Promise.all([
+    loadBuiltInAppBackgrounds(),
+    listUploadedBackgrounds(),
+    readStoredActiveBackgroundId(),
+  ]);
+  const items = mergeAppBackgroundAssets(builtIns, uploads);
+  const activeBackgroundId = resolveActiveBackgroundId({
+    activeBackgroundId: storedActiveBackgroundId,
+    items,
+  });
+
+  if (activeBackgroundId !== storedActiveBackgroundId) {
+    await persistActiveBackgroundId(activeBackgroundId);
+  }
+
+  return { items, activeBackgroundId };
+}
+
+export async function setAppBackgroundActive(
+  selection: AppBackgroundActiveSelection
+): Promise<AppBackgroundActiveSelection> {
+  const catalog = await getAppBackgroundCatalog();
+
+  if (
+    selection.activeBackgroundId !== null &&
+    !catalog.items.some((item) => item.id === selection.activeBackgroundId)
+  ) {
+    throw new HttpError(404, "App background not found", "NOT_FOUND");
+  }
+
+  const activeBackgroundId = resolveActiveBackgroundId({
+    activeBackgroundId: selection.activeBackgroundId,
+    items: catalog.items,
+  });
+  await persistActiveBackgroundId(activeBackgroundId);
+  return { activeBackgroundId };
+}
+
+export async function importAppBackground(params: {
+  fileBuffer: Buffer;
+  originalName: string;
+}): Promise<AppBackgroundAsset> {
+  await fs.mkdir(APP_BACKGROUNDS_FOLDER, { recursive: true });
+
+  const extension = path.extname(params.originalName).toLowerCase();
+  const filename = `${randomUUID()}${extension}`;
+  const filePath = resolveSafePath(APP_BACKGROUNDS_FOLDER, filename);
+  await fs.writeFile(filePath, params.fileBuffer);
+
+  const now = new Date();
+  const id = `upload:${randomUUID()}`;
+  const db = await initDb();
+  await db.insert(uiAppBackgrounds).values({
+    id,
+    name: resolveUploadedBackgroundName(params.originalName),
+    fileName: filename,
+    createdAt: now,
+    updatedAt: now,
+  });
+
+  return rowToAsset({
+    id,
+    name: resolveUploadedBackgroundName(params.originalName),
+    fileName: filename,
+    createdAt: now,
+    updatedAt: now,
+  });
+}
+
+export async function deleteAppBackground(params: {
+  id: string;
+}): Promise<AppBackgroundActiveSelection & { deletedId: string }> {
+  if (params.id.startsWith("builtin:")) {
+    throw new HttpError(400, "Built-in backgrounds cannot be deleted", "VALIDATION_ERROR");
+  }
+
+  const db = await initDb();
+  const rows = await db
+    .select()
+    .from(uiAppBackgrounds)
+    .where(eq(uiAppBackgrounds.id, params.id))
+    .limit(1);
+  const row = rows[0];
+  if (!row) {
+    throw new HttpError(404, "App background not found", "NOT_FOUND");
+  }
+
+  await db.delete(uiAppBackgrounds).where(eq(uiAppBackgrounds.id, params.id));
+  await fs.rm(resolveSafePath(APP_BACKGROUNDS_FOLDER, row.fileName), {
+    force: true,
+  });
+
+  const catalog = await getAppBackgroundCatalog();
+  return {
+    deletedId: params.id,
+    activeBackgroundId: catalog.activeBackgroundId,
+  };
+}
diff --git a/shared/types/app-background.ts b/shared/types/app-background.ts
new file mode 100644
index 00000000..c4170a87
--- /dev/null
+++ b/shared/types/app-background.ts
@@ -0,0 +1,18 @@
+export type AppBackgroundSource = "builtin" | "uploaded";
+
+export interface AppBackgroundAsset {
+  id: string;
+  name: string;
+  source: AppBackgroundSource;
+  imageUrl: string;
+  deletable: boolean;
+}
+
+export interface AppBackgroundCatalog {
+  items: AppBackgroundAsset[];
+  activeBackgroundId: string | null;
+}
+
+export interface AppBackgroundActiveSelection {
+  activeBackgroundId: string | null;
+}
diff --git a/web/src/App.tsx b/web/src/App.tsx
index 02aa3a52..17c3c3f6 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -2,6 +2,7 @@ import { Box, Button, Flex, Stack, Text } from '@mantine/core';
 import { useUnit } from 'effector-react';
 import { useTranslation } from 'react-i18next';
 
+import { $activeAppBackgroundUrl } from '@model/app-backgrounds';
 import { $appInitError, $appInitPending, $isAppReady, appStarted } from '@model/app-init';
 import { $currentEntityProfile, createEntityProfileFx } from '@model/chat-core';
 
@@ -11,7 +12,7 @@ import { LeftBar } from './features/sidebars/left-bar';
 
 function App() {
 	const { t } = useTranslation();
-	const currentProfile = useUnit($currentEntityProfile);
+	const [currentProfile, activeBackgroundUrl] = useUnit([$currentEntityProfile, $activeAppBackgroundUrl]);
 	const [isAppReady, isAppInitPending, appInitError, retryInit] = useUnit([
 		$isAppReady,
 		$appInitPending,
@@ -47,7 +48,10 @@ function App() {
 
 	return (
 		<>
-			<Flex className="ts-app-shell">
+			<Flex
+				className="ts-app-shell"
+				style={activeBackgroundUrl ? { backgroundImage: `url(${activeBackgroundUrl})` } : undefined}
+			>
 				<LeftBar />
 				<Flex className="ts-app-main" direction="column">
 					<Box flex={1} style={{ overflow: 'hidden' }}>
diff --git a/web/src/api/app-backgrounds.ts b/web/src/api/app-backgrounds.ts
new file mode 100644
index 00000000..c202ad2b
--- /dev/null
+++ b/web/src/api/app-backgrounds.ts
@@ -0,0 +1,61 @@
+import { BASE_URL } from "../const";
+
+import { apiJson } from "./api-json";
+
+import type {
+  AppBackgroundActiveSelection,
+  AppBackgroundAsset,
+  AppBackgroundCatalog,
+} from "@shared/types/app-background";
+
+type ApiEnvelope<T> = { data: T; error?: unknown };
+
+export const APP_BACKGROUND_BACKEND_ORIGIN = BASE_URL.replace(/\/api\/?$/, "");
+
+export async function listAppBackgrounds(): Promise<AppBackgroundCatalog> {
+  return apiJson<AppBackgroundCatalog>("/app-backgrounds");
+}
+
+export async function importAppBackground(file: File): Promise<AppBackgroundAsset> {
+  const form = new FormData();
+  form.append("image", file);
+
+  const response = await fetch(`${BASE_URL}/app-backgrounds/import`, {
+    method: "POST",
+    body: form,
+  });
+
+  const body = (await response.json().catch(() => ({}))) as Partial<ApiEnvelope<AppBackgroundAsset>> & {
+    error?: { message?: string };
+  };
+
+  if (!response.ok) {
+    throw new Error(body?.error?.message ?? `HTTP error ${response.status}`);
+  }
+
+  return body.data as AppBackgroundAsset;
+}
+
+export async function setActiveAppBackground(
+  activeBackgroundId: string | null
+): Promise<AppBackgroundActiveSelection> {
+  return apiJson<AppBackgroundActiveSelection>("/app-backgrounds/active", {
+    method: "PUT",
+    body: JSON.stringify({ activeBackgroundId }),
+  });
+}
+
+export async function deleteAppBackground(
+  id: string
+): Promise<AppBackgroundActiveSelection & { deletedId: string }> {
+  return apiJson<AppBackgroundActiveSelection & { deletedId: string }>(
+    `/app-backgrounds/${encodeURIComponent(id)}`,
+    {
+      method: "DELETE",
+    }
+  );
+}
+
+export function toAbsoluteAppBackgroundUrl(imageUrl: string): string {
+  return imageUrl.startsWith("http") ? imageUrl : `${APP_BACKGROUND_BACKEND_ORIGIN}${imageUrl}`;
+}
diff --git a/web/src/features/chat-window/index.tsx b/web/src/features/chat-window/index.tsx
index 61019bb1..1b99089d 100644
--- a/web/src/features/chat-window/index.tsx
+++ b/web/src/features/chat-window/index.tsx
@@ -18,8 +18,6 @@ import {
 	resetUnseenMessages,
 } from '@model/chat-entry-parts';
 
-import BGImages from '../../assets/bg.png';
-
 import { AvatarPreviewPanel, type ChatAvatarPreview } from './avatar-preview-panel';
 import { MessageInput } from './input';
 import { MessageActionModals } from './message/message-action-modals';
@@ -156,7 +154,7 @@ export const ChatWindow: React.FC = () => {
 	}, [clearUnseenMessages]);
 
 	return (
-		<Box className="ts-chat-window" style={{ backgroundImage: `url(${BGImages})` }}>
+		<Box className="ts-chat-window">
 			<Box className="ts-chat-window__inner" data-preview-open={avatarPreview ? 'true' : 'false'}>
 				<Box className="ts-chat-scroll" ref={handleScrollElementRef} onScroll={handleScroll} onWheel={handleWheel}>
 					<Box className="ts-chat-content">
diff --git a/web/src/features/sidebars/app-settings/backgrounds-tab.tsx b/web/src/features/sidebars/app-settings/backgrounds-tab.tsx
new file mode 100644
index 00000000..bfce4c26
--- /dev/null
+++ b/web/src/features/sidebars/app-settings/backgrounds-tab.tsx
@@ -0,0 +1,187 @@
+import {
+  ActionIcon,
+  AspectRatio,
+  Box,
+  Button,
+  Card,
+  FileButton,
+  Group,
+  Image,
+  SimpleGrid,
+  Stack,
+  Text,
+} from "@mantine/core";
+import { useUnit } from "effector-react";
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { LuTrash2 } from "react-icons/lu";
+
+import {
+  $activeAppBackgroundId,
+  $appBackgroundCatalogError,
+  $appBackgroundItems,
+  deleteAppBackgroundFx,
+  importAppBackgroundFx,
+  loadAppBackgroundCatalogFx,
+  setActiveAppBackgroundFx,
+} from "@model/app-backgrounds";
+
+import { toAbsoluteAppBackgroundUrl } from "../../../api/app-backgrounds";
+
+import type { AppBackgroundAsset } from "@shared/types/app-background";
+
+function resolveBackgroundLabel(asset: AppBackgroundAsset, t: (key: string) => string): string {
+  if (asset.id === "builtin:default") {
+    return t("appSettings.backgrounds.builtInNames.default");
+  }
+  return asset.name;
+}
+
+export const BackgroundsTab = () => {
+  const { t } = useTranslation();
+  const [items, activeBackgroundId, catalogError, isLoading, isImporting, isDeleting, isSelecting] = useUnit([
+    $appBackgroundItems,
+    $activeAppBackgroundId,
+    $appBackgroundCatalogError,
+    loadAppBackgroundCatalogFx.pending,
+    importAppBackgroundFx.pending,
+    deleteAppBackgroundFx.pending,
+    setActiveAppBackgroundFx.pending,
+  ]);
+
+  useEffect(() => {
+    if (items.length === 0 && !isLoading && !catalogError) {
+      void loadAppBackgroundCatalogFx();
+    }
+  }, [catalogError, isLoading, items.length]);
+
+  const handleImport = (file: File | null) => {
+    if (!file) return;
+    void importAppBackgroundFx(file);
+  };
+
+  const handleSelect = (backgroundId: string) => {
+    if (backgroundId === activeBackgroundId) return;
+    void setActiveAppBackgroundFx(backgroundId);
+  };
+
+  if (isLoading && items.length === 0) {
+    return <Text size="sm">{t("appSettings.backgrounds.states.loading")}</Text>;
+  }
+
+  if (catalogError && items.length === 0) {
+    return (
+      <Stack gap="sm">
+        <Text size="sm" c="red">
+          {t("appSettings.backgrounds.states.loadFailed")}
+        </Text>
+        <Text size="xs" c="dimmed">
+          {catalogError}
+        </Text>
+        <Group>
+          <Button size="xs" variant="default" onClick={() => void loadAppBackgroundCatalogFx()}>
+            {t("appSettings.backgrounds.actions.retry")}
+          </Button>
+        </Group>
+      </Stack>
+    );
+  }
+
+  return (
+    <Stack gap="md">
+      <Group justify="space-between" align="center">
+        <Text size="sm" c="dimmed">
+          {t("appSettings.backgrounds.description")}
+        </Text>
+        <FileButton onChange={handleImport} accept="image/*">
+          {(props) => (
+            <Button {...props} size="xs" variant="default" loading={isImporting}>
+              {t("appSettings.backgrounds.actions.import")}
+            </Button>
+          )}
+        </FileButton>
+      </Group>
+
+      {items.length === 0 ? (
+        <Text size="sm" c="dimmed">
+          {t("appSettings.backgrounds.states.empty")}
+        </Text>
+      ) : (
+        <SimpleGrid cols={{ base: 1, xs: 2, md: 3 }} spacing="sm">
+          {items.map((item) => {
+            const isActive = item.id === activeBackgroundId;
+            const displayName = resolveBackgroundLabel(item, t);
+
+            return (
+              <Card
+                key={item.id}
+                withBorder
+                radius="md"
+                padding="xs"
+                role="button"
+                tabIndex={0}
+                aria-pressed={isActive}
+                onClick={() => handleSelect(item.id)}
+                onKeyDown={(event) => {
+                  if (event.key === "Enter" || event.key === " ") {
+                    event.preventDefault();
+                    handleSelect(item.id);
+                  }
+                }}
+                style={{
+                  cursor: "pointer",
+                  borderColor: isActive ? "var(--ts-accent)" : "var(--mantine-color-default-border)",
+                  boxShadow: isActive ? "0 0 0 1px var(--ts-accent)" : undefined,
+                }}
+              >
+                <Card.Section>
+                  <AspectRatio ratio={16 / 9}>
+                    <Image src={toAbsoluteAppBackgroundUrl(item.imageUrl)} alt={displayName} fit="cover" />
+                  </AspectRatio>
+                </Card.Section>
+
+                <Stack gap={6} mt="xs">
+                  <Group justify="space-between" align="flex-start" wrap="nowrap">
+                    <Box style={{ minWidth: 0 }}>
+                      <Text size="sm" fw={600} truncate="end">
+                        {displayName}
+                      </Text>
+                      <Text size="xs" c="dimmed">
+                        {item.source === "builtin"
+                          ? t("appSettings.backgrounds.labels.builtIn")
+                          : t("appSettings.backgrounds.labels.imported")}
+                      </Text>
+                    </Box>
+
+                    {item.deletable ? (
+                      <ActionIcon
+                        color="red"
+                        variant="subtle"
+                        aria-label={t("appSettings.backgrounds.actions.delete")}
+                        disabled={isDeleting}
+                        onClick={(event) => {
+                          event.stopPropagation();
+                          void deleteAppBackgroundFx(item.id);
+                        }}
+                      >
+                        <LuTrash2 size={16} />
+                      </ActionIcon>
+                    ) : null}
+                  </Group>
+
+                  <Text size="xs" c={isActive ? "cyan" : "dimmed"}>
+                    {isActive
+                      ? t("appSettings.backgrounds.labels.selected")
+                      : isSelecting
+                        ? t("appSettings.backgrounds.labels.selecting")
+                        : t("appSettings.backgrounds.labels.clickToApply")}
+                  </Text>
+                </Stack>
+              </Card>
+            );
+          })}
+        </SimpleGrid>
+      )}
+    </Stack>
+  );
+};
diff --git a/web/src/features/sidebars/app-settings/debug-tab.tsx b/web/src/features/sidebars/app-settings/debug-tab.tsx
new file mode 100644
index 00000000..969d3706
--- /dev/null
+++ b/web/src/features/sidebars/app-settings/debug-tab.tsx
@@ -0,0 +1,94 @@
+import { Box, Button, Checkbox, Group, Stack, Text } from "@mantine/core";
+import { useUnit } from "effector-react";
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+
+import { $appDebugEnabled, setAppDebugEnabled } from "@model/app-debug";
+import {
+  $chatGenerationLogFilters,
+  CHAT_GENERATION_LOG_FILTER_DEFINITIONS,
+  applyOperationAndSnapshotsLogPreset,
+  disableAllChatGenerationLogFilters,
+  enableAllChatGenerationLogFilters,
+  resetChatGenerationLogFilters,
+  setChatGenerationLogFilter,
+} from "@model/chat-generation-debug";
+
+export const DebugTab = () => {
+  const { t } = useTranslation();
+  const [appDebugEnabled, debugLogFilters] = useUnit([$appDebugEnabled, $chatGenerationLogFilters]);
+
+  const debugLogFilterItems = useMemo(
+    () =>
+      CHAT_GENERATION_LOG_FILTER_DEFINITIONS.map((item) => ({
+        ...item,
+        label: t(item.labelKey),
+        description: t(item.descriptionKey),
+      })),
+    [t]
+  );
+
+  return (
+    <Stack gap="md">
+      <Checkbox
+        checked={appDebugEnabled}
+        onChange={(event) => setAppDebugEnabled(event.currentTarget.checked)}
+        label={t("appSettings.debug.label")}
+      />
+      <Text size="xs" c="dimmed">
+        {t("appSettings.debug.info")}
+      </Text>
+
+      <Box>
+        <Text size="sm" fw={600} mb={4}>
+          {t("appSettings.debug.logsTitle")}
+        </Text>
+        <Text size="xs" c="dimmed" mb="xs">
+          {t("appSettings.debug.logsInfo")}
+        </Text>
+
+        <Group gap="xs" mb="xs">
+          <Button size="xs" variant="light" onClick={() => enableAllChatGenerationLogFilters()}>
+            {t("appSettings.debug.actions.enableAll")}
+          </Button>
+          <Button size="xs" variant="light" onClick={() => disableAllChatGenerationLogFilters()}>
+            {t("appSettings.debug.actions.disableAll")}
+          </Button>
+          <Button size="xs" variant="light" onClick={() => applyOperationAndSnapshotsLogPreset()}>
+            {t("appSettings.debug.actions.operationsAndSnapshots")}
+          </Button>
+          <Button size="xs" variant="default" onClick={() => resetChatGenerationLogFilters()}>
+            {t("appSettings.debug.actions.resetDefaults")}
+          </Button>
+        </Group>
+
+        <Stack gap="xs">
+          {debugLogFilterItems.map((item) => (
+            <Box
+              key={item.id}
+              p="xs"
+              style={{
+                border: "1px solid var(--mantine-color-default-border)",
+                borderRadius: "var(--mantine-radius-sm)",
+              }}
+            >
+              <Checkbox
+                checked={Boolean(debugLogFilters[item.id])}
+                onChange={(event) =>
+                  setChatGenerationLogFilter({
+                    id: item.id,
+                    enabled: event.currentTarget.checked,
+                  })
+                }
+                label={item.label}
+              />
+              <Text size="xs" c="dimmed" mt={4} ml={28}>
+                {item.description}
+              </Text>
+            </Box>
+          ))}
+        </Stack>
+      </Box>
+    </Stack>
+  );
+};
diff --git a/web/src/features/sidebars/app-settings/general-tab.tsx b/web/src/features/sidebars/app-settings/general-tab.tsx
new file mode 100644
index 00000000..e7880d9c
--- /dev/null
+++ b/web/src/features/sidebars/app-settings/general-tab.tsx
@@ -0,0 +1,45 @@
+import { Box, Stack, Title } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+
+import { FormCheckbox, FormSelect } from "@ui/form-components";
+
+export const GeneralTab = () => {
+  const { t } = useTranslation();
+
+  return (
+    <Stack gap="lg">
+      <Box>
+        <Title order={4} mb="md">
+          {t("appSettings.sections.general")}
+        </Title>
+
+        <Stack gap="md">
+          <FormSelect
+            name="language"
+            label={t("appSettings.language.label")}
+            selectProps={{
+              options: [
+                { value: "ru", label: t("appSettings.languages.ru") },
+                { value: "en", label: t("appSettings.languages.en") },
+              ],
+              allowDeselect: false,
+              comboboxProps: { withinPortal: false },
+            }}
+          />
+
+          <FormCheckbox
+            name="openLastChat"
+            label={t("appSettings.openLastChat.label")}
+            infoTip={t("appSettings.openLastChat.info")}
+          />
+
+          <FormCheckbox
+            name="autoSelectCurrentPersona"
+            label={t("appSettings.autoSelectCurrentPersona.label")}
+            infoTip={t("appSettings.autoSelectCurrentPersona.info")}
+          />
+        </Stack>
+      </Box>
+    </Stack>
+  );
+};
diff --git a/web/src/features/sidebars/app-settings/index.tsx b/web/src/features/sidebars/app-settings/index.tsx
index beab22e2..c8c7efa8 100644
--- a/web/src/features/sidebars/app-settings/index.tsx
+++ b/web/src/features/sidebars/app-settings/index.tsx
@@ -1,109 +1,23 @@
-import {
-  Accordion,
-  Box,
-  Button,
-  Checkbox,
-  FileButton,
-  Group,
-  Select,
-  SegmentedControl,
-  Stack,
-  Tabs,
-  Text,
-  TextInput,
-  Textarea,
-  Title,
-  useComputedColorScheme,
-  useMantineColorScheme,
-} from "@mantine/core";
+import { Tabs } from "@mantine/core";
 import { type AppSettings } from "@shared/types/app-settings";
-import {
-  DEFAULT_UI_THEME_PAYLOAD,
-  UI_THEME_BUILT_IN_IDS,
-} from "@shared/types/ui-theme";
 import { useUnit } from "effector-react";
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import { $appDebugEnabled, setAppDebugEnabled } from "@model/app-debug";
 import { $appSettings, fetchAppSettingsFx, updateAppSettings } from "@model/app-settings";
-import {
-  $chatGenerationLogFilters,
-  CHAT_GENERATION_LOG_FILTER_DEFINITIONS,
-  applyOperationAndSnapshotsLogPreset,
-  disableAllChatGenerationLogFilters,
-  enableAllChatGenerationLogFilters,
-  resetChatGenerationLogFilters,
-  setChatGenerationLogFilter,
-} from "@model/chat-generation-debug";
-import {
-  $activeUiThemePreset,
-  $uiThemePresets,
-  $uiThemeSettings,
-  createUiThemePresetFx,
-  deleteUiThemePresetFx,
-  patchUiThemeSettingsFx,
-  updateUiThemePresetFx,
-} from "@model/ui-themes";
 import { Drawer } from "@ui/drawer";
-import { FormCheckbox, FormSelect } from "@ui/form-components";
-import { toaster } from "@ui/toaster";
 
-import { downloadBlobFile, exportBundle, importBundle } from "../../../api/bundles";
-import { resolveBundleAutoApplyTargets } from "../common/bundle-helpers";
-
-type AppSettingsTab = "general" | "theming" | "debug";
-type ColorSchemeValue = "light" | "dark" | "auto";
-
-function cloneValue<T>(input: T): T {
-  return JSON.parse(JSON.stringify(input)) as T;
-}
-
-function resolveNextPresetName(baseName: string, usedNames: Set<string>): string {
-  const trimmed = baseName.trim();
-  if (!usedNames.has(trimmed)) return trimmed;
-  for (let idx = 2; idx <= 9999; idx += 1) {
-    const candidate = `${trimmed} ${idx}`;
-    if (!usedNames.has(candidate)) return candidate;
-  }
-  return `${trimmed} ${Date.now()}`;
-}
+import { BackgroundsTab } from "./backgrounds-tab";
+import { DebugTab } from "./debug-tab";
+import { GeneralTab } from "./general-tab";
+import { ThemingTab } from "./theming-tab";
+import { type AppSettingsTab } from "./types";
 
 export const AppSettingsSidebar: React.FC = () => {
   const { t } = useTranslation();
-  const [appSettings, appDebugEnabled, presets, settings, activePreset] = useUnit([
-    $appSettings,
-    $appDebugEnabled,
-    $uiThemePresets,
-    $uiThemeSettings,
-    $activeUiThemePreset,
-  ]);
-  const debugLogFilters = useUnit($chatGenerationLogFilters);
+  const appSettings = useUnit($appSettings);
   const [activeTab, setActiveTab] = useState<AppSettingsTab>("general");
-  const [draftPreset, setDraftPreset] = useState<typeof activePreset>(null);
-  const { colorScheme, setColorScheme } = useMantineColorScheme();
-  const computedColorScheme = useComputedColorScheme("light");
-  const selectedColorScheme: ColorSchemeValue =
-    settings?.colorScheme ?? (colorScheme === "auto" ? computedColorScheme : colorScheme);
-
-  const languageOptions = [
-    { value: "ru", label: t("appSettings.languages.ru") },
-    { value: "en", label: t("appSettings.languages.en") },
-  ];
-  const presetOptions = useMemo(() => presets.map((x) => ({ value: x.presetId, label: x.name })), [presets]);
-  const selectedPresetId = settings?.activePresetId ?? activePreset?.presetId ?? null;
-  const activePresetRef = useRef(activePreset);
-  const debugLogFilterItems = useMemo(
-    () =>
-      CHAT_GENERATION_LOG_FILTER_DEFINITIONS.map((item) => ({
-        ...item,
-        label: t(item.labelKey),
-        description: t(item.descriptionKey),
-      })),
-    [t]
-  );
-
   const methods = useForm<AppSettings>({
     defaultValues: appSettings,
   });
@@ -127,132 +41,6 @@ export const AppSettingsSidebar: React.FC = () => {
     };
   }, [methods]);
 
-  useEffect(() => {
-    activePresetRef.current = activePreset;
-  }, [activePreset]);
-
-  useEffect(() => {
-    setDraftPreset(activePresetRef.current ? cloneValue(activePresetRef.current) : null);
-  }, [activePreset?.presetId, activePreset?.version]);
-
-  const updateToken = (
-    tokenType: "lightTokens" | "darkTokens",
-    tokenKey: string,
-    tokenValue: string
-  ) => {
-    setDraftPreset((prev) => {
-      if (!prev) return prev;
-      const next = cloneValue(prev);
-      next.payload[tokenType][tokenKey] = tokenValue;
-      return next;
-    });
-  };
-
-  const handleApplyColorScheme = (value: string) => {
-    const next = value as ColorSchemeValue;
-    if (settings?.colorScheme === next) return;
-    setColorScheme(next);
-    void patchUiThemeSettingsFx({ colorScheme: next });
-  };
-
-  const handleSelectPreset = (presetId: string | null) => {
-    if (!presetId) return;
-    if (settings?.activePresetId === presetId) return;
-    void patchUiThemeSettingsFx({ activePresetId: presetId });
-  };
-
-  const handleCreateNewPreset = () => {
-    const usedNames = new Set(presets.map((item) => item.name));
-    const nextName = resolveNextPresetName(t("appSettings.theming.defaults.newPresetName"), usedNames);
-
-    const defaultPresetPayload =
-      presets.find((item) => item.presetId === UI_THEME_BUILT_IN_IDS.default)?.payload ?? DEFAULT_UI_THEME_PAYLOAD;
-
-    void createUiThemePresetFx({
-      name: nextName,
-      payload: cloneValue(defaultPresetPayload),
-    }).then((created) => {
-      void patchUiThemeSettingsFx({ activePresetId: created.presetId });
-    });
-  };
-
-  const handleCreatePresetCopy = () => {
-    const source = draftPreset ?? activePreset;
-    if (!source) return;
-
-    const usedNames = new Set(presets.map((item) => item.name));
-    const nextName = resolveNextPresetName(`${source.name} (copy)`, usedNames);
-
-    void createUiThemePresetFx({
-      name: nextName,
-      description: source.description,
-      payload: cloneValue(source.payload),
-    }).then((created) => {
-      void patchUiThemeSettingsFx({ activePresetId: created.presetId });
-    });
-  };
-
-  const handleSavePreset = () => {
-    if (!draftPreset || draftPreset.builtIn) return;
-    void updateUiThemePresetFx({
-      presetId: draftPreset.presetId,
-      name: draftPreset.name,
-      description: draftPreset.description ?? null,
-      payload: draftPreset.payload,
-    });
-  };
-
-  const handleDeletePreset = () => {
-    if (!draftPreset || draftPreset.builtIn) return;
-    if (!window.confirm(t("appSettings.theming.confirm.deletePreset"))) return;
-    void deleteUiThemePresetFx(draftPreset.presetId);
-  };
-
-  const handleExportPreset = async () => {
-    if (!draftPreset) return;
-    try {
-      const exported = await exportBundle({
-        source: { kind: "ui_theme_preset", id: draftPreset.presetId },
-        selections: [{ kind: "ui_theme_preset", id: draftPreset.presetId }],
-        format: "auto",
-      });
-      downloadBlobFile(exported.filename, exported.blob);
-    } catch (error) {
-      toaster.error({
-        title: t("appSettings.theming.toasts.exportFailed"),
-        description: error instanceof Error ? error.message : String(error),
-      });
-    }
-  };
-
-  const handleImportPreset = async (file: File | null) => {
-    if (!file) return;
-    try {
-      const imported = await importBundle(file);
-      const applyTargets = resolveBundleAutoApplyTargets(imported);
-      if (applyTargets.uiThemePresetId) {
-        await patchUiThemeSettingsFx({ activePresetId: applyTargets.uiThemePresetId });
-      }
-      if (applyTargets.warnings.length > 0) {
-        toaster.warning({
-          title: t("appSettings.theming.toasts.importDone"),
-          description: applyTargets.warnings.join(" "),
-        });
-      }
-      toaster.success({
-        title: t("appSettings.theming.toasts.importDone"),
-        description: t("appSettings.theming.toasts.importedCount", {
-          count: imported.created.uiThemePresets.length,
-        }),
-      });
-    } catch (error) {
-      toaster.error({
-        title: t("appSettings.theming.toasts.importFailed"),
-        description: error instanceof Error ? error.message : String(error),
-      });
-    }
-  };
-
   return (
     <Drawer name="appSettings" title={t("appSettings.title")}>
       <FormProvider {...methods}>
@@ -260,422 +48,21 @@ export const AppSettingsSidebar: React.FC = () => {
           <Tabs.List mb="md">
             <Tabs.Tab value="general">{t("appSettings.tabs.general")}</Tabs.Tab>
             <Tabs.Tab value="theming">{t("appSettings.tabs.theming")}</Tabs.Tab>
+            <Tabs.Tab value="backgrounds">{t("appSettings.tabs.backgrounds")}</Tabs.Tab>
             <Tabs.Tab value="debug">{t("appSettings.tabs.debug")}</Tabs.Tab>
           </Tabs.List>
 
           <Tabs.Panel value="general">
-            <Stack gap="lg">
-              <Box>
-                <Title order={4} mb="md">
-                  {t("appSettings.sections.general")}
-                </Title>
-
-                <Stack gap="md">
-                  <FormSelect
-                    name="language"
-                    label={t("appSettings.language.label")}
-                    selectProps={{
-                      options: languageOptions,
-                      allowDeselect: false,
-                      comboboxProps: { withinPortal: false },
-                    }}
-                  />
-
-                  <FormCheckbox
-                    name="openLastChat"
-                    label={t("appSettings.openLastChat.label")}
-                    infoTip={t("appSettings.openLastChat.info")}
-                  />
-
-                  <FormCheckbox
-                    name="autoSelectCurrentPersona"
-                    label={t("appSettings.autoSelectCurrentPersona.label")}
-                    infoTip={t("appSettings.autoSelectCurrentPersona.info")}
-                  />
-                </Stack>
-              </Box>
-            </Stack>
+            <GeneralTab />
           </Tabs.Panel>
-
           <Tabs.Panel value="theming">
-            <Stack gap="md">
-              <Text size="sm" fw={600}>
-                {t("appSettings.theming.mode")}
-              </Text>
-              <SegmentedControl
-                fullWidth
-                value={selectedColorScheme}
-                onChange={handleApplyColorScheme}
-                data={[
-                  { label: t("appSettings.theming.light"), value: "light" },
-                  { label: t("appSettings.theming.dark"), value: "dark" },
-                  { label: t("appSettings.theming.auto"), value: "auto" },
-                ]}
-              />
-
-              <Select
-                label={t("appSettings.theming.activePreset")}
-                data={presetOptions}
-                value={selectedPresetId}
-                onChange={handleSelectPreset}
-                allowDeselect={false}
-                comboboxProps={{ withinPortal: false }}
-              />
-
-              <Group gap="xs">
-                <Button size="xs" variant="light" onClick={handleCreateNewPreset}>
-                  {t("appSettings.theming.actions.createNew")}
-                </Button>
-                <Button size="xs" variant="light" onClick={handleCreatePresetCopy} disabled={!activePreset}>
-                  {t("appSettings.theming.actions.createCopy")}
-                </Button>
-                <FileButton onChange={handleImportPreset} accept=".json">
-                  {(props) => (
-                    <Button {...props} size="xs" variant="default">
-                      {t("appSettings.theming.actions.import")}
-                    </Button>
-                  )}
-                </FileButton>
-                <Button size="xs" variant="default" onClick={handleExportPreset} disabled={!draftPreset}>
-                  {t("appSettings.theming.actions.export")}
-                </Button>
-                <Button
-                  size="xs"
-                  color="red"
-                  variant="light"
-                  onClick={handleDeletePreset}
-                  disabled={!draftPreset || Boolean(draftPreset.builtIn)}
-                >
-                  {t("appSettings.theming.actions.delete")}
-                </Button>
-              </Group>
-
-              {draftPreset && (
-                <Stack gap="sm">
-                  <TextInput
-                    label={t("appSettings.theming.presetName")}
-                    value={draftPreset.name}
-                    onChange={(event) =>
-                      setDraftPreset((prev) => (prev ? { ...prev, name: event.currentTarget.value } : prev))
-                    }
-                    disabled={draftPreset.builtIn}
-                  />
-                  <Textarea
-                    label={t("appSettings.theming.presetDescription")}
-                    value={draftPreset.description ?? ""}
-                    onChange={(event) =>
-                      setDraftPreset((prev) =>
-                        prev ? { ...prev, description: event.currentTarget.value || undefined } : prev
-                      )
-                    }
-                    autosize
-                    minRows={2}
-                    disabled={draftPreset.builtIn}
-                  />
-
-                  {draftPreset.builtIn && (
-                    <Text size="xs" c="dimmed">
-                      {t("appSettings.theming.builtInReadOnly")}
-                    </Text>
-                  )}
-
-                  <Accordion variant="separated" defaultValue="light">
-                    <Accordion.Item value="light">
-                      <Accordion.Control>{t("appSettings.theming.lightTokens")}</Accordion.Control>
-                      <Accordion.Panel>
-                        <Stack gap="xs">
-                          {Object.entries(draftPreset.payload.lightTokens).map(([key, value]) => (
-                            <TextInput
-                              key={`light-${key}`}
-                              label={key}
-                              value={value}
-                              onChange={(event) => updateToken("lightTokens", key, event.currentTarget.value)}
-                              disabled={draftPreset.builtIn}
-                            />
-                          ))}
-                        </Stack>
-                      </Accordion.Panel>
-                    </Accordion.Item>
-
-                    <Accordion.Item value="dark">
-                      <Accordion.Control>{t("appSettings.theming.darkTokens")}</Accordion.Control>
-                      <Accordion.Panel>
-                        <Stack gap="xs">
-                          {Object.entries(draftPreset.payload.darkTokens).map(([key, value]) => (
-                            <TextInput
-                              key={`dark-${key}`}
-                              label={key}
-                              value={value}
-                              onChange={(event) => updateToken("darkTokens", key, event.currentTarget.value)}
-                              disabled={draftPreset.builtIn}
-                            />
-                          ))}
-                        </Stack>
-                      </Accordion.Panel>
-                    </Accordion.Item>
-
-                    <Accordion.Item value="typography">
-                      <Accordion.Control>{t("appSettings.theming.typography")}</Accordion.Control>
-                      <Accordion.Panel>
-                        <Stack gap="xs">
-                          <TextInput
-                            label="uiFontFamily"
-                            value={draftPreset.payload.typography.uiFontFamily}
-                            onChange={(event) =>
-                              setDraftPreset((prev) =>
-                                prev
-                                  ? {
-                                      ...prev,
-                                      payload: {
-                                        ...prev.payload,
-                                        typography: {
-                                          ...prev.payload.typography,
-                                          uiFontFamily: event.currentTarget.value,
-                                        },
-                                      },
-                                    }
-                                  : prev
-                              )
-                            }
-                            disabled={draftPreset.builtIn}
-                          />
-                          <TextInput
-                            label="chatFontFamily"
-                            value={draftPreset.payload.typography.chatFontFamily}
-                            onChange={(event) =>
-                              setDraftPreset((prev) =>
-                                prev
-                                  ? {
-                                      ...prev,
-                                      payload: {
-                                        ...prev.payload,
-                                        typography: {
-                                          ...prev.payload.typography,
-                                          chatFontFamily: event.currentTarget.value,
-                                        },
-                                      },
-                                    }
-                                  : prev
-                              )
-                            }
-                            disabled={draftPreset.builtIn}
-                          />
-                          <TextInput
-                            label="uiBaseFontSize"
-                            value={draftPreset.payload.typography.uiBaseFontSize}
-                            onChange={(event) =>
-                              setDraftPreset((prev) =>
-                                prev
-                                  ? {
-                                      ...prev,
-                                      payload: {
-                                        ...prev.payload,
-                                        typography: {
-                                          ...prev.payload.typography,
-                                          uiBaseFontSize: event.currentTarget.value,
-                                        },
-                                      },
-                                    }
-                                  : prev
-                              )
-                            }
-                            disabled={draftPreset.builtIn}
-                          />
-                          <TextInput
-                            label="chatBaseFontSize"
-                            value={draftPreset.payload.typography.chatBaseFontSize}
-                            onChange={(event) =>
-                              setDraftPreset((prev) =>
-                                prev
-                                  ? {
-                                      ...prev,
-                                      payload: {
-                                        ...prev.payload,
-                                        typography: {
-                                          ...prev.payload.typography,
-                                          chatBaseFontSize: event.currentTarget.value,
-                                        },
-                                      },
-                                    }
-                                  : prev
-                              )
-                            }
-                            disabled={draftPreset.builtIn}
-                          />
-                        </Stack>
-                      </Accordion.Panel>
-                    </Accordion.Item>
-
-                    <Accordion.Item value="markdown">
-                      <Accordion.Control>{t("appSettings.theming.markdown")}</Accordion.Control>
-                      <Accordion.Panel>
-                        <Stack gap="xs">
-                          <TextInput
-                            label="fontSize"
-                            value={draftPreset.payload.markdown.fontSize}
-                            onChange={(event) =>
-                              setDraftPreset((prev) =>
-                                prev
-                                  ? {
-                                      ...prev,
-                                      payload: {
-                                        ...prev.payload,
-                                        markdown: {
-                                          ...prev.payload.markdown,
-                                          fontSize: event.currentTarget.value,
-                                        },
-                                      },
-                                    }
-                                  : prev
-                              )
-                            }
-                            disabled={draftPreset.builtIn}
-                          />
-                          <TextInput
-                            label="lineHeight"
-                            value={draftPreset.payload.markdown.lineHeight}
-                            onChange={(event) =>
-                              setDraftPreset((prev) =>
-                                prev
-                                  ? {
-                                      ...prev,
-                                      payload: {
-                                        ...prev.payload,
-                                        markdown: {
-                                          ...prev.payload.markdown,
-                                          lineHeight: event.currentTarget.value,
-                                        },
-                                      },
-                                    }
-                                  : prev
-                              )
-                            }
-                            disabled={draftPreset.builtIn}
-                          />
-                          <TextInput
-                            label="codeFontSize"
-                            value={draftPreset.payload.markdown.codeFontSize}
-                            onChange={(event) =>
-                              setDraftPreset((prev) =>
-                                prev
-                                  ? {
-                                      ...prev,
-                                      payload: {
-                                        ...prev.payload,
-                                        markdown: {
-                                          ...prev.payload.markdown,
-                                          codeFontSize: event.currentTarget.value,
-                                        },
-                                      },
-                                    }
-                                  : prev
-                              )
-                            }
-                            disabled={draftPreset.builtIn}
-                          />
-                        </Stack>
-                      </Accordion.Panel>
-                    </Accordion.Item>
-
-                    <Accordion.Item value="css">
-                      <Accordion.Control>{t("appSettings.theming.customCss")}</Accordion.Control>
-                      <Accordion.Panel>
-                        <Textarea
-                          value={draftPreset.payload.customCss}
-                          onChange={(event) =>
-                            setDraftPreset((prev) =>
-                              prev
-                                ? {
-                                    ...prev,
-                                    payload: { ...prev.payload, customCss: event.currentTarget.value },
-                                  }
-                                : prev
-                            )
-                          }
-                          autosize
-                          minRows={8}
-                          maxRows={18}
-                          disabled={draftPreset.builtIn}
-                        />
-                        <Text size="xs" c="dimmed" mt={6}>
-                          {t("appSettings.theming.customCssHint")}
-                        </Text>
-                      </Accordion.Panel>
-                    </Accordion.Item>
-                  </Accordion>
-
-                  <Group justify="flex-end">
-                    <Button onClick={handleSavePreset} disabled={!draftPreset || draftPreset.builtIn}>
-                      {t("appSettings.theming.actions.save")}
-                    </Button>
-                  </Group>
-                </Stack>
-              )}
-            </Stack>
+            <ThemingTab />
+          </Tabs.Panel>
+          <Tabs.Panel value="backgrounds">
+            <BackgroundsTab />
           </Tabs.Panel>
-
           <Tabs.Panel value="debug">
-            <Stack gap="md">
-              <Checkbox
-                checked={appDebugEnabled}
-                onChange={(event) => setAppDebugEnabled(event.currentTarget.checked)}
-                label={t("appSettings.debug.label")}
-              />
-              <Text size="xs" c="dimmed">
-                {t("appSettings.debug.info")}
-              </Text>
-
-              <Box>
-                <Text size="sm" fw={600} mb={4}>
-                  {t("appSettings.debug.logsTitle")}
-                </Text>
-                <Text size="xs" c="dimmed" mb="xs">
-                  {t("appSettings.debug.logsInfo")}
-                </Text>
-
-                <Group gap="xs" mb="xs">
-                  <Button size="xs" variant="light" onClick={() => enableAllChatGenerationLogFilters()}>
-                    {t("appSettings.debug.actions.enableAll")}
-                  </Button>
-                  <Button size="xs" variant="light" onClick={() => disableAllChatGenerationLogFilters()}>
-                    {t("appSettings.debug.actions.disableAll")}
-                  </Button>
-                  <Button size="xs" variant="light" onClick={() => applyOperationAndSnapshotsLogPreset()}>
-                    {t("appSettings.debug.actions.operationsAndSnapshots")}
-                  </Button>
-                  <Button size="xs" variant="default" onClick={() => resetChatGenerationLogFilters()}>
-                    {t("appSettings.debug.actions.resetDefaults")}
-                  </Button>
-                </Group>
-
-                <Stack gap="xs">
-                  {debugLogFilterItems.map((item) => (
-                    <Box
-                      key={item.id}
-                      p="xs"
-                      style={{
-                        border: "1px solid var(--mantine-color-default-border)",
-                        borderRadius: "var(--mantine-radius-sm)",
-                      }}
-                    >
-                      <Checkbox
-                        checked={Boolean(debugLogFilters[item.id])}
-                        onChange={(event) =>
-                          setChatGenerationLogFilter({
-                            id: item.id,
-                            enabled: event.currentTarget.checked,
-                          })
-                        }
-                        label={item.label}
-                      />
-                      <Text size="xs" c="dimmed" mt={4} ml={28}>
-                        {item.description}
-                      </Text>
-                    </Box>
-                  ))}
-                </Stack>
-              </Box>
-            </Stack>
+            <DebugTab />
           </Tabs.Panel>
         </Tabs>
       </FormProvider>
diff --git a/web/src/features/sidebars/app-settings/theme-preset-accordion.tsx b/web/src/features/sidebars/app-settings/theme-preset-accordion.tsx
new file mode 100644
index 00000000..68e64fdb
--- /dev/null
+++ b/web/src/features/sidebars/app-settings/theme-preset-accordion.tsx
@@ -0,0 +1,261 @@
+import { Accordion, Stack, Text, TextInput, Textarea } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+
+import type { UiThemePresetDto } from "../../../api/ui-theme";
+
+type ThemePresetAccordionProps = {
+  draftPreset: UiThemePresetDto;
+  onChange: (next: UiThemePresetDto) => void;
+};
+
+type ThemeSectionProps = ThemePresetAccordionProps;
+
+const ThemeTokenSection = ({ draftPreset, onChange }: ThemeSectionProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <Accordion.Item value="light">
+        <Accordion.Control>{t("appSettings.theming.lightTokens")}</Accordion.Control>
+      <Accordion.Panel>
+        <Stack gap="xs">
+          {Object.entries(draftPreset.payload.lightTokens).map(([key, value]) => (
+            <TextInput
+              key={`light-${key}`}
+              label={key}
+              value={value}
+              onChange={(event) =>
+                onChange({
+                  ...draftPreset,
+                  payload: {
+                    ...draftPreset.payload,
+                    lightTokens: {
+                      ...draftPreset.payload.lightTokens,
+                      [key]: event.currentTarget.value,
+                    },
+                  },
+                })
+              }
+              disabled={draftPreset.builtIn}
+            />
+          ))}
+        </Stack>
+      </Accordion.Panel>
+      </Accordion.Item>
+
+      <Accordion.Item value="dark">
+        <Accordion.Control>{t("appSettings.theming.darkTokens")}</Accordion.Control>
+      <Accordion.Panel>
+        <Stack gap="xs">
+          {Object.entries(draftPreset.payload.darkTokens).map(([key, value]) => (
+            <TextInput
+              key={`dark-${key}`}
+              label={key}
+              value={value}
+              onChange={(event) =>
+                onChange({
+                  ...draftPreset,
+                  payload: {
+                    ...draftPreset.payload,
+                    darkTokens: {
+                      ...draftPreset.payload.darkTokens,
+                      [key]: event.currentTarget.value,
+                    },
+                  },
+                })
+              }
+              disabled={draftPreset.builtIn}
+            />
+          ))}
+        </Stack>
+      </Accordion.Panel>
+      </Accordion.Item>
+    </>
+  );
+};
+
+const ThemeTypographySection = ({ draftPreset, onChange }: ThemeSectionProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <Accordion.Item value="typography">
+      <Accordion.Control>{t("appSettings.theming.typography")}</Accordion.Control>
+    <Accordion.Panel>
+      <Stack gap="xs">
+        <TextInput
+          label="uiFontFamily"
+          value={draftPreset.payload.typography.uiFontFamily}
+          onChange={(event) =>
+            onChange({
+              ...draftPreset,
+              payload: {
+                ...draftPreset.payload,
+                typography: {
+                  ...draftPreset.payload.typography,
+                  uiFontFamily: event.currentTarget.value,
+                },
+              },
+            })
+          }
+          disabled={draftPreset.builtIn}
+        />
+        <TextInput
+          label="chatFontFamily"
+          value={draftPreset.payload.typography.chatFontFamily}
+          onChange={(event) =>
+            onChange({
+              ...draftPreset,
+              payload: {
+                ...draftPreset.payload,
+                typography: {
+                  ...draftPreset.payload.typography,
+                  chatFontFamily: event.currentTarget.value,
+                },
+              },
+            })
+          }
+          disabled={draftPreset.builtIn}
+        />
+        <TextInput
+          label="uiBaseFontSize"
+          value={draftPreset.payload.typography.uiBaseFontSize}
+          onChange={(event) =>
+            onChange({
+              ...draftPreset,
+              payload: {
+                ...draftPreset.payload,
+                typography: {
+                  ...draftPreset.payload.typography,
+                  uiBaseFontSize: event.currentTarget.value,
+                },
+              },
+            })
+          }
+          disabled={draftPreset.builtIn}
+        />
+        <TextInput
+          label="chatBaseFontSize"
+          value={draftPreset.payload.typography.chatBaseFontSize}
+          onChange={(event) =>
+            onChange({
+              ...draftPreset,
+              payload: {
+                ...draftPreset.payload,
+                typography: {
+                  ...draftPreset.payload.typography,
+                  chatBaseFontSize: event.currentTarget.value,
+                },
+              },
+            })
+          }
+          disabled={draftPreset.builtIn}
+        />
+      </Stack>
+    </Accordion.Panel>
+    </Accordion.Item>
+  );
+};
+
+const ThemeMarkdownSection = ({ draftPreset, onChange }: ThemeSectionProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <Accordion.Item value="markdown">
+      <Accordion.Control>{t("appSettings.theming.markdown")}</Accordion.Control>
+    <Accordion.Panel>
+      <Stack gap="xs">
+        <TextInput
+          label="fontSize"
+          value={draftPreset.payload.markdown.fontSize}
+          onChange={(event) =>
+            onChange({
+              ...draftPreset,
+              payload: {
+                ...draftPreset.payload,
+                markdown: {
+                  ...draftPreset.payload.markdown,
+                  fontSize: event.currentTarget.value,
+                },
+              },
+            })
+          }
+          disabled={draftPreset.builtIn}
+        />
+        <TextInput
+          label="lineHeight"
+          value={draftPreset.payload.markdown.lineHeight}
+          onChange={(event) =>
+            onChange({
+              ...draftPreset,
+              payload: {
+                ...draftPreset.payload,
+                markdown: {
+                  ...draftPreset.payload.markdown,
+                  lineHeight: event.currentTarget.value,
+                },
+              },
+            })
+          }
+          disabled={draftPreset.builtIn}
+        />
+        <TextInput
+          label="codeFontSize"
+          value={draftPreset.payload.markdown.codeFontSize}
+          onChange={(event) =>
+            onChange({
+              ...draftPreset,
+              payload: {
+                ...draftPreset.payload,
+                markdown: {
+                  ...draftPreset.payload.markdown,
+                  codeFontSize: event.currentTarget.value,
+                },
+              },
+            })
+          }
+          disabled={draftPreset.builtIn}
+        />
+      </Stack>
+    </Accordion.Panel>
+    </Accordion.Item>
+  );
+};
+
+const ThemeCssSection = ({ draftPreset, onChange }: ThemeSectionProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <Accordion.Item value="css">
+      <Accordion.Control>{t("appSettings.theming.customCss")}</Accordion.Control>
+      <Accordion.Panel>
+        <Textarea
+          value={draftPreset.payload.customCss}
+          onChange={(event) =>
+            onChange({
+              ...draftPreset,
+              payload: { ...draftPreset.payload, customCss: event.currentTarget.value },
+            })
+          }
+          autosize
+          minRows={8}
+          maxRows={18}
+          disabled={draftPreset.builtIn}
+        />
+        <Text size="xs" c="dimmed" mt={6}>
+          {t("appSettings.theming.customCssHint")}
+        </Text>
+      </Accordion.Panel>
+    </Accordion.Item>
+  );
+};
+
+export const ThemePresetAccordion = ({ draftPreset, onChange }: ThemePresetAccordionProps) => {
+  return (
+    <Accordion variant="separated" defaultValue="light">
+      <ThemeTokenSection draftPreset={draftPreset} onChange={onChange} />
+      <ThemeTypographySection draftPreset={draftPreset} onChange={onChange} />
+      <ThemeMarkdownSection draftPreset={draftPreset} onChange={onChange} />
+      <ThemeCssSection draftPreset={draftPreset} onChange={onChange} />
+    </Accordion>
+  );
+};
diff --git a/web/src/features/sidebars/app-settings/theme-preset-editor.tsx b/web/src/features/sidebars/app-settings/theme-preset-editor.tsx
new file mode 100644
index 00000000..5c48ecce
--- /dev/null
+++ b/web/src/features/sidebars/app-settings/theme-preset-editor.tsx
@@ -0,0 +1,53 @@
+import { Button, Group, Stack, Text, TextInput, Textarea } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+
+import { ThemePresetAccordion } from "./theme-preset-accordion";
+
+import type { UiThemePresetDto } from "../../../api/ui-theme";
+
+type ThemePresetEditorProps = {
+  draftPreset: UiThemePresetDto;
+  onChange: (next: UiThemePresetDto) => void;
+  onSave: () => void;
+};
+
+export const ThemePresetEditor = ({ draftPreset, onChange, onSave }: ThemePresetEditorProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <Stack gap="sm">
+      <TextInput
+        label={t("appSettings.theming.presetName")}
+        value={draftPreset.name}
+        onChange={(event) => onChange({ ...draftPreset, name: event.currentTarget.value })}
+        disabled={draftPreset.builtIn}
+      />
+      <Textarea
+        label={t("appSettings.theming.presetDescription")}
+        value={draftPreset.description ?? ""}
+        onChange={(event) =>
+          onChange({
+            ...draftPreset,
+            description: event.currentTarget.value || undefined,
+          })
+        }
+        autosize
+        minRows={2}
+        disabled={draftPreset.builtIn}
+      />
+
+      {draftPreset.builtIn ? (
+        <Text size="xs" c="dimmed">
+          {t("appSettings.theming.builtInReadOnly")}
+        </Text>
+      ) : null}
+      <ThemePresetAccordion draftPreset={draftPreset} onChange={onChange} />
+
+      <Group justify="flex-end">
+        <Button onClick={onSave} disabled={draftPreset.builtIn}>
+          {t("appSettings.theming.actions.save")}
+        </Button>
+      </Group>
+    </Stack>
+  );
+};
diff --git a/web/src/features/sidebars/app-settings/theming-tab.tsx b/web/src/features/sidebars/app-settings/theming-tab.tsx
new file mode 100644
index 00000000..b0bde718
--- /dev/null
+++ b/web/src/features/sidebars/app-settings/theming-tab.tsx
@@ -0,0 +1,227 @@
+import { Button, FileButton, Group, Select, SegmentedControl, Stack, Text, useComputedColorScheme, useMantineColorScheme } from "@mantine/core";
+import {
+  DEFAULT_UI_THEME_PAYLOAD,
+  UI_THEME_BUILT_IN_IDS,
+} from "@shared/types/ui-theme";
+import { useUnit } from "effector-react";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import {
+  $activeUiThemePreset,
+  $uiThemePresets,
+  $uiThemeSettings,
+  createUiThemePresetFx,
+  deleteUiThemePresetFx,
+  patchUiThemeSettingsFx,
+  updateUiThemePresetFx,
+} from "@model/ui-themes";
+import { toaster } from "@ui/toaster";
+
+import { downloadBlobFile, exportBundle, importBundle } from "../../../api/bundles";
+import { resolveBundleAutoApplyTargets } from "../common/bundle-helpers";
+
+import { ThemePresetEditor } from "./theme-preset-editor";
+
+import type { UiThemePresetDto } from "../../../api/ui-theme";
+
+type ColorSchemeValue = "light" | "dark" | "auto";
+
+function resolveNextPresetName(baseName: string, usedNames: Set<string>): string {
+  const trimmed = baseName.trim();
+  if (!usedNames.has(trimmed)) return trimmed;
+  for (let idx = 2; idx <= 9999; idx += 1) {
+    const candidate = `${trimmed} ${idx}`;
+    if (!usedNames.has(candidate)) return candidate;
+  }
+  return `${trimmed} ${Date.now()}`;
+}
+
+export const ThemingTab = () => {
+  const { t } = useTranslation();
+  const [presets, settings, activePreset] = useUnit([
+    $uiThemePresets,
+    $uiThemeSettings,
+    $activeUiThemePreset,
+  ]);
+  const [draftPreset, setDraftPreset] = useState<UiThemePresetDto | null>(null);
+  const { colorScheme, setColorScheme } = useMantineColorScheme();
+  const computedColorScheme = useComputedColorScheme("light");
+  const selectedColorScheme: ColorSchemeValue =
+    settings?.colorScheme ?? (colorScheme === "auto" ? computedColorScheme : colorScheme);
+  const presetOptions = useMemo(() => presets.map((x) => ({ value: x.presetId, label: x.name })), [presets]);
+  const selectedPresetId = settings?.activePresetId ?? activePreset?.presetId ?? null;
+  const activePresetRef = useRef(activePreset);
+
+  useEffect(() => {
+    activePresetRef.current = activePreset;
+  }, [activePreset]);
+
+  useEffect(() => {
+    setDraftPreset(activePresetRef.current ? structuredClone(activePresetRef.current) : null);
+  }, [activePreset?.presetId, activePreset?.version]);
+
+  const handleApplyColorScheme = (value: string) => {
+    const next = value as ColorSchemeValue;
+    if (settings?.colorScheme === next) return;
+    setColorScheme(next);
+    void patchUiThemeSettingsFx({ colorScheme: next });
+  };
+
+  const handleSelectPreset = (presetId: string | null) => {
+    if (!presetId) return;
+    if (settings?.activePresetId === presetId) return;
+    void patchUiThemeSettingsFx({ activePresetId: presetId });
+  };
+
+  const handleCreateNewPreset = () => {
+    const usedNames = new Set(presets.map((item) => item.name));
+    const nextName = resolveNextPresetName(t("appSettings.theming.defaults.newPresetName"), usedNames);
+
+    const defaultPresetPayload =
+      presets.find((item) => item.presetId === UI_THEME_BUILT_IN_IDS.default)?.payload ?? DEFAULT_UI_THEME_PAYLOAD;
+
+    void createUiThemePresetFx({
+      name: nextName,
+      payload: structuredClone(defaultPresetPayload),
+    }).then((created) => {
+      void patchUiThemeSettingsFx({ activePresetId: created.presetId });
+    });
+  };
+
+  const handleCreatePresetCopy = () => {
+    const source = draftPreset ?? activePreset;
+    if (!source) return;
+
+    const usedNames = new Set(presets.map((item) => item.name));
+    const nextName = resolveNextPresetName(`${source.name} (copy)`, usedNames);
+
+    void createUiThemePresetFx({
+      name: nextName,
+      description: source.description,
+      payload: structuredClone(source.payload),
+    }).then((created) => {
+      void patchUiThemeSettingsFx({ activePresetId: created.presetId });
+    });
+  };
+
+  const handleSavePreset = () => {
+    if (!draftPreset || draftPreset.builtIn) return;
+    void updateUiThemePresetFx({
+      presetId: draftPreset.presetId,
+      name: draftPreset.name,
+      description: draftPreset.description ?? null,
+      payload: draftPreset.payload,
+    });
+  };
+
+  const handleDeletePreset = () => {
+    if (!draftPreset || draftPreset.builtIn) return;
+    if (!window.confirm(t("appSettings.theming.confirm.deletePreset"))) return;
+    void deleteUiThemePresetFx(draftPreset.presetId);
+  };
+
+  const handleExportPreset = async () => {
+    if (!draftPreset) return;
+    try {
+      const exported = await exportBundle({
+        source: { kind: "ui_theme_preset", id: draftPreset.presetId },
+        selections: [{ kind: "ui_theme_preset", id: draftPreset.presetId }],
+        format: "auto",
+      });
+      downloadBlobFile(exported.filename, exported.blob);
+    } catch (error) {
+      toaster.error({
+        title: t("appSettings.theming.toasts.exportFailed"),
+        description: error instanceof Error ? error.message : String(error),
+      });
+    }
+  };
+
+  const handleImportPreset = async (file: File | null) => {
+    if (!file) return;
+    try {
+      const imported = await importBundle(file);
+      const applyTargets = resolveBundleAutoApplyTargets(imported);
+      if (applyTargets.uiThemePresetId) {
+        await patchUiThemeSettingsFx({ activePresetId: applyTargets.uiThemePresetId });
+      }
+      if (applyTargets.warnings.length > 0) {
+        toaster.warning({
+          title: t("appSettings.theming.toasts.importDone"),
+          description: applyTargets.warnings.join(" "),
+        });
+      }
+      toaster.success({
+        title: t("appSettings.theming.toasts.importDone"),
+        description: t("appSettings.theming.toasts.importedCount", {
+          count: imported.created.uiThemePresets.length,
+        }),
+      });
+    } catch (error) {
+      toaster.error({
+        title: t("appSettings.theming.toasts.importFailed"),
+        description: error instanceof Error ? error.message : String(error),
+      });
+    }
+  };
+
+  return (
+    <Stack gap="md">
+      <Text size="sm" fw={600}>
+        {t("appSettings.theming.mode")}
+      </Text>
+      <SegmentedControl
+        fullWidth
+        value={selectedColorScheme}
+        onChange={handleApplyColorScheme}
+        data={[
+          { label: t("appSettings.theming.light"), value: "light" },
+          { label: t("appSettings.theming.dark"), value: "dark" },
+          { label: t("appSettings.theming.auto"), value: "auto" },
+        ]}
+      />
+
+      <Select
+        label={t("appSettings.theming.activePreset")}
+        data={presetOptions}
+        value={selectedPresetId}
+        onChange={handleSelectPreset}
+        allowDeselect={false}
+        comboboxProps={{ withinPortal: false }}
+      />
+
+      <Group gap="xs">
+        <Button size="xs" variant="light" onClick={handleCreateNewPreset}>
+          {t("appSettings.theming.actions.createNew")}
+        </Button>
+        <Button size="xs" variant="light" onClick={handleCreatePresetCopy} disabled={!activePreset}>
+          {t("appSettings.theming.actions.createCopy")}
+        </Button>
+        <FileButton onChange={handleImportPreset} accept=".json">
+          {(props) => (
+            <Button {...props} size="xs" variant="default">
+              {t("appSettings.theming.actions.import")}
+            </Button>
+          )}
+        </FileButton>
+        <Button size="xs" variant="default" onClick={handleExportPreset} disabled={!draftPreset}>
+          {t("appSettings.theming.actions.export")}
+        </Button>
+        <Button
+          size="xs"
+          color="red"
+          variant="light"
+          onClick={handleDeletePreset}
+          disabled={!draftPreset || Boolean(draftPreset?.builtIn)}
+        >
+          {t("appSettings.theming.actions.delete")}
+        </Button>
+      </Group>
+
+      {draftPreset ? (
+        <ThemePresetEditor draftPreset={draftPreset} onChange={setDraftPreset} onSave={handleSavePreset} />
+      ) : null}
+    </Stack>
+  );
+};
diff --git a/web/src/features/sidebars/app-settings/types.ts b/web/src/features/sidebars/app-settings/types.ts
new file mode 100644
index 00000000..9710bd45
--- /dev/null
+++ b/web/src/features/sidebars/app-settings/types.ts
@@ -0,0 +1 @@
+export type AppSettingsTab = "general" | "theming" | "backgrounds" | "debug";
diff --git a/web/src/i18n/resources/en/appSettings.ts b/web/src/i18n/resources/en/appSettings.ts
index ce7861c4..71fa7c22 100644
--- a/web/src/i18n/resources/en/appSettings.ts
+++ b/web/src/i18n/resources/en/appSettings.ts
@@ -3,6 +3,7 @@
 			tabs: {
 				general: 'General',
 				theming: 'Theming',
+				backgrounds: 'Backgrounds',
 				debug: 'Debug',
 			},
 			sections: {
@@ -53,6 +54,36 @@
 					exportFailed: 'Failed to export preset',
 				},
 			},
+			backgrounds: {
+				description: 'Choose an app background or import your own.',
+				builtInNames: {
+					default: 'Default background',
+				},
+				actions: {
+					import: 'Import',
+					delete: 'Delete',
+					retry: 'Retry',
+				},
+				labels: {
+					builtIn: 'Built-in',
+					imported: 'Imported',
+					selected: 'Selected',
+					selecting: 'Applying...',
+					clickToApply: 'Click to apply',
+				},
+				states: {
+					loading: 'Loading backgrounds...',
+					loadFailed: 'Failed to load backgrounds',
+					empty: 'No backgrounds available yet',
+				},
+				toasts: {
+					importDone: 'Background imported',
+					importFailed: 'Failed to import background',
+					selectFailed: 'Failed to apply background',
+					deleteDone: 'Background deleted',
+					deleteFailed: 'Failed to delete background',
+				},
+			},
 			language: {
 				label: 'Language',
 			},
diff --git a/web/src/i18n/resources/ru/appSettings.ts b/web/src/i18n/resources/ru/appSettings.ts
index 7cc46534..1c4b7370 100644
--- a/web/src/i18n/resources/ru/appSettings.ts
+++ b/web/src/i18n/resources/ru/appSettings.ts
@@ -3,6 +3,7 @@
 			tabs: {
 				general: 'Основные',
 				theming: 'Темизация',
+				backgrounds: 'Фоны',
 				debug: 'Debug',
 			},
 			sections: {
@@ -53,6 +54,36 @@
 					exportFailed: 'Не удалось экспортировать пресет',
 				},
 			},
+			backgrounds: {
+				description: 'Выберите фон приложения или импортируйте свой.',
+				builtInNames: {
+					default: 'Фон по умолчанию',
+				},
+				actions: {
+					import: 'Импортировать',
+					delete: 'Удалить',
+					retry: 'Повторить',
+				},
+				labels: {
+					builtIn: 'Дефолтный',
+					imported: 'Импортированный',
+					selected: 'Выбран',
+					selecting: 'Применяется...',
+					clickToApply: 'Нажмите, чтобы применить',
+				},
+				states: {
+					loading: 'Загрузка фонов...',
+					loadFailed: 'Не удалось загрузить список фонов',
+					empty: 'Фоны пока недоступны',
+				},
+				toasts: {
+					importDone: 'Фон импортирован',
+					importFailed: 'Не удалось импортировать фон',
+					selectFailed: 'Не удалось применить фон',
+					deleteDone: 'Фон удалён',
+					deleteFailed: 'Не удалось удалить фон',
+				},
+			},
 			language: {
 				label: 'Язык',
 			},
diff --git a/web/src/index.css b/web/src/index.css
index 4e48377a..40b1388a 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -164,6 +164,9 @@ a {
   height: 100%;
   min-height: 0;
   background: transparent;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
 }
 
 .ts-app-main {
diff --git a/web/src/model/app-backgrounds/helpers.test.ts b/web/src/model/app-backgrounds/helpers.test.ts
new file mode 100644
index 00000000..ca1abc90
--- /dev/null
+++ b/web/src/model/app-backgrounds/helpers.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vitest";
+
+import { resolveActiveAppBackground } from "./helpers";
+
+import type { AppBackgroundAsset } from "@shared/types/app-background";
+
+describe("app background helpers", () => {
+  const items: AppBackgroundAsset[] = [
+    {
+      id: "builtin:default",
+      name: "Default background",
+      source: "builtin",
+      imageUrl: "/defaults/backgrounds/default-bg.png",
+      deletable: false,
+    },
+    {
+      id: "upload:1",
+      name: "Imported",
+      source: "uploaded",
+      imageUrl: "/media/images/app-backgrounds/imported.png",
+      deletable: true,
+    },
+  ];
+
+  it("returns matching active background", () => {
+    expect(resolveActiveAppBackground(items, "upload:1")?.id).toBe("upload:1");
+  });
+
+  it("falls back to built-in background when id is missing", () => {
+    expect(resolveActiveAppBackground(items, "upload:missing")?.id).toBe("builtin:default");
+  });
+});
diff --git a/web/src/model/app-backgrounds/helpers.ts b/web/src/model/app-backgrounds/helpers.ts
new file mode 100644
index 00000000..040e1c8b
--- /dev/null
+++ b/web/src/model/app-backgrounds/helpers.ts
@@ -0,0 +1,13 @@
+import type { AppBackgroundAsset } from "@shared/types/app-background";
+
+export function resolveActiveAppBackground(
+  items: AppBackgroundAsset[],
+  activeBackgroundId: string | null
+): AppBackgroundAsset | null {
+  if (activeBackgroundId) {
+    const activeItem = items.find((item) => item.id === activeBackgroundId);
+    if (activeItem) return activeItem;
+  }
+
+  return items.find((item) => item.source === "builtin") ?? items[0] ?? null;
+}
diff --git a/web/src/model/app-backgrounds/index.ts b/web/src/model/app-backgrounds/index.ts
new file mode 100644
index 00000000..5dce6a27
--- /dev/null
+++ b/web/src/model/app-backgrounds/index.ts
@@ -0,0 +1,111 @@
+import { combine, createEffect, createEvent, createStore, sample } from "effector";
+
+import {
+  deleteAppBackground,
+  importAppBackground,
+  listAppBackgrounds,
+  setActiveAppBackground,
+  toAbsoluteAppBackgroundUrl,
+} from "../../api/app-backgrounds";
+import i18n from "../../i18n";
+import { toaster } from "../../ui/toaster";
+
+import { resolveActiveAppBackground } from "./helpers";
+
+import type {
+  AppBackgroundActiveSelection,
+  AppBackgroundAsset,
+  AppBackgroundCatalog,
+} from "@shared/types/app-background";
+
+export const loadAppBackgroundCatalogFx = createEffect(async (): Promise<AppBackgroundCatalog> => {
+  return listAppBackgrounds();
+});
+
+export const importAppBackgroundFx = createEffect(async (file: File): Promise<AppBackgroundAsset> => {
+  return importAppBackground(file);
+});
+
+export const setActiveAppBackgroundFx = createEffect(
+  async (activeBackgroundId: string | null): Promise<AppBackgroundActiveSelection> => {
+    return setActiveAppBackground(activeBackgroundId);
+  }
+);
+
+export const deleteAppBackgroundFx = createEffect(
+  async (id: string): Promise<AppBackgroundActiveSelection & { deletedId: string }> => {
+    return deleteAppBackground(id);
+  }
+);
+
+export const appBackgroundsReloadRequested = createEvent();
+
+export const $appBackgroundCatalog = createStore<AppBackgroundCatalog>({
+  items: [],
+  activeBackgroundId: null,
+})
+  .on(loadAppBackgroundCatalogFx.doneData, (_, catalog) => catalog)
+  .on(setActiveAppBackgroundFx.doneData, (state, selection) => ({
+    ...state,
+    activeBackgroundId: selection.activeBackgroundId,
+  }))
+  .on(deleteAppBackgroundFx.doneData, (state, payload) => ({
+    items: state.items.filter((item) => item.id !== payload.deletedId),
+    activeBackgroundId: payload.activeBackgroundId,
+  }));
+
+export const $appBackgroundItems = $appBackgroundCatalog.map((catalog) => catalog.items);
+export const $activeAppBackgroundId = $appBackgroundCatalog.map((catalog) => catalog.activeBackgroundId);
+export const $appBackgroundCatalogError = createStore<string | null>(null)
+  .on(loadAppBackgroundCatalogFx.failData, (_, error) => (error instanceof Error ? error.message : String(error)))
+  .reset(loadAppBackgroundCatalogFx.done, appBackgroundsReloadRequested);
+
+export const $activeAppBackground = combine(
+  $appBackgroundItems,
+  $activeAppBackgroundId,
+  (items, activeBackgroundId) => resolveActiveAppBackground(items, activeBackgroundId)
+);
+
+export const $activeAppBackgroundUrl = $activeAppBackground.map((item) =>
+  item ? toAbsoluteAppBackgroundUrl(item.imageUrl) : null
+);
+
+sample({
+  clock: appBackgroundsReloadRequested,
+  target: loadAppBackgroundCatalogFx,
+});
+
+sample({
+  clock: [importAppBackgroundFx.doneData, deleteAppBackgroundFx.doneData],
+  target: loadAppBackgroundCatalogFx,
+});
+
+importAppBackgroundFx.doneData.watch((background) => {
+  toaster.success({
+    title: i18n.t("appSettings.backgrounds.toasts.importDone"),
+    description: background.name,
+  });
+});
+importAppBackgroundFx.failData.watch((error) => {
+  toaster.error({
+    title: i18n.t("appSettings.backgrounds.toasts.importFailed"),
+    description: error instanceof Error ? error.message : String(error),
+  });
+});
+setActiveAppBackgroundFx.failData.watch((error) => {
+  toaster.error({
+    title: i18n.t("appSettings.backgrounds.toasts.selectFailed"),
+    description: error instanceof Error ? error.message : String(error),
+  });
+});
+deleteAppBackgroundFx.doneData.watch(() => {
+  toaster.success({
+    title: i18n.t("appSettings.backgrounds.toasts.deleteDone"),
+  });
+});
+deleteAppBackgroundFx.failData.watch((error) => {
+  toaster.error({
+    title: i18n.t("appSettings.backgrounds.toasts.deleteFailed"),
+    description: error instanceof Error ? error.message : String(error),
+  });
+});
diff --git a/web/src/model/app-init.ts b/web/src/model/app-init.ts
index b28a2ccc..1de83255 100644
--- a/web/src/model/app-init.ts
+++ b/web/src/model/app-init.ts
@@ -1,5 +1,6 @@
 import { createEffect, createEvent, createStore, sample } from 'effector';
 
+import { loadAppBackgroundCatalogFx } from './app-backgrounds';
 import { fetchAppSettingsFx } from './app-settings';
 import { loadEntityProfilesFx } from './chat-core';
 import { instructionsInitRequested } from './instructions';
@@ -22,6 +23,7 @@ export const appInitFx = createEffect(async (): Promise<void> => {
 		// UI state
 		fetchSidebarsFx(),
 		fetchAppSettingsFx(),
+		loadAppBackgroundCatalogFx(),
 		fetchLlmSettingsFx(),
 		loadUiThemePresetsFx(),
 		loadUiThemeSettingsFx(),

From 1e4318902f890403a0c0ad72f0448b32ceecc97b Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Wed, 18 Mar 2026 00:51:18 +0300
Subject: [PATCH 25/54] fix: theme

---
 .../ui-theme/ui-theme-built-ins.test.ts       |  49 +++
 .../services/ui-theme/ui-theme-built-ins.ts   |  28 ++
 .../services/ui-theme/ui-theme-repository.ts  |   8 +-
 shared/types/ui-theme.ts                      |   4 +-
 .../app-settings/theme-field-metadata.test.ts |  24 ++
 .../app-settings/theme-field-metadata.ts      | 292 +++++++++++++
 .../app-settings/theme-preset-accordion.tsx   | 390 ++++++++----------
 web/src/i18n/resources/en/appSettings.ts      |  83 ++++
 web/src/i18n/resources/ru/appSettings.ts      |  83 ++++
 9 files changed, 739 insertions(+), 222 deletions(-)
 create mode 100644 server/src/services/ui-theme/ui-theme-built-ins.test.ts
 create mode 100644 server/src/services/ui-theme/ui-theme-built-ins.ts
 create mode 100644 web/src/features/sidebars/app-settings/theme-field-metadata.test.ts
 create mode 100644 web/src/features/sidebars/app-settings/theme-field-metadata.ts

diff --git a/server/src/services/ui-theme/ui-theme-built-ins.test.ts b/server/src/services/ui-theme/ui-theme-built-ins.test.ts
new file mode 100644
index 00000000..10b440ff
--- /dev/null
+++ b/server/src/services/ui-theme/ui-theme-built-ins.test.ts
@@ -0,0 +1,49 @@
+import { DEFAULT_UI_THEME_PAYLOAD, UI_THEME_BUILT_IN_IDS, type UiThemePresetPayload } from "@shared/types/ui-theme";
+import { describe, expect, test } from "vitest";
+
+import { resolveUiThemePresetPayload } from "./ui-theme-built-ins";
+
+describe("ui theme built-ins", () => {
+  test("returns canonical payload for built-in presets even when stored payload is stale", () => {
+    const stalePayload: UiThemePresetPayload = {
+      ...DEFAULT_UI_THEME_PAYLOAD,
+      lightTokens: {
+        ...DEFAULT_UI_THEME_PAYLOAD.lightTokens,
+        "--ts-left-rail-bg":
+          "linear-gradient(180deg, rgba(255, 255, 255, 0.72), rgba(245, 251, 255, 0.66))",
+      },
+      darkTokens: {
+        ...DEFAULT_UI_THEME_PAYLOAD.darkTokens,
+        "--ts-left-rail-bg":
+          "linear-gradient(180deg, rgba(24, 28, 34, 0.9), rgba(16, 20, 25, 0.88))",
+      },
+    };
+
+    const resolved = resolveUiThemePresetPayload({
+      presetId: UI_THEME_BUILT_IN_IDS.default,
+      builtIn: true,
+      storedPayload: stalePayload,
+    });
+
+    expect(resolved.lightTokens["--ts-left-rail-bg"]).toBe("linear-gradient(180deg, #ffffff, #f5fbff)");
+    expect(resolved.darkTokens["--ts-left-rail-bg"]).toBe("linear-gradient(180deg, #181c22, #101419)");
+  });
+
+  test("keeps stored payload for non built-in presets", () => {
+    const customPayload: UiThemePresetPayload = {
+      ...DEFAULT_UI_THEME_PAYLOAD,
+      lightTokens: {
+        ...DEFAULT_UI_THEME_PAYLOAD.lightTokens,
+        "--ts-left-rail-bg": "custom-value",
+      },
+    };
+
+    const resolved = resolveUiThemePresetPayload({
+      presetId: "custom-theme",
+      builtIn: false,
+      storedPayload: customPayload,
+    });
+
+    expect(resolved.lightTokens["--ts-left-rail-bg"]).toBe("custom-value");
+  });
+});
diff --git a/server/src/services/ui-theme/ui-theme-built-ins.ts b/server/src/services/ui-theme/ui-theme-built-ins.ts
new file mode 100644
index 00000000..68cec170
--- /dev/null
+++ b/server/src/services/ui-theme/ui-theme-built-ins.ts
@@ -0,0 +1,28 @@
+import { BUILT_IN_UI_THEME_PRESETS, type UiThemePresetPayload } from "@shared/types/ui-theme";
+
+const BUILT_IN_PAYLOAD_BY_ID = new Map(
+  BUILT_IN_UI_THEME_PRESETS.map((preset) => [preset.id, preset.payload]),
+);
+
+function clonePayload(payload: UiThemePresetPayload): UiThemePresetPayload {
+  return {
+    ...payload,
+    lightTokens: { ...payload.lightTokens },
+    darkTokens: { ...payload.darkTokens },
+    typography: { ...payload.typography },
+    markdown: { ...payload.markdown },
+  };
+}
+
+export function resolveUiThemePresetPayload(params: {
+  presetId: string;
+  builtIn: boolean;
+  storedPayload: UiThemePresetPayload;
+}): UiThemePresetPayload {
+  if (!params.builtIn) {
+    return clonePayload(params.storedPayload);
+  }
+
+  const builtInPayload = BUILT_IN_PAYLOAD_BY_ID.get(params.presetId);
+  return builtInPayload ? clonePayload(builtInPayload) : clonePayload(params.storedPayload);
+}
diff --git a/server/src/services/ui-theme/ui-theme-repository.ts b/server/src/services/ui-theme/ui-theme-repository.ts
index 8c88b341..f5e9a385 100644
--- a/server/src/services/ui-theme/ui-theme-repository.ts
+++ b/server/src/services/ui-theme/ui-theme-repository.ts
@@ -20,6 +20,7 @@ import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { initDb } from "../../db/client";
 import { uiThemePresets, uiThemeSettings } from "../../db/schema";
 
+import { resolveUiThemePresetPayload } from "./ui-theme-built-ins";
 import { validateUiThemePayload } from "./ui-theme-validator";
 
 const DEFAULT_OWNER_ID = "global";
@@ -48,7 +49,7 @@ function rowToPreset(row: UiThemePresetRow): UiThemePreset {
   const validatedPayload = validateUiThemePayload(
     safeJsonParse<UiThemePresetPayload>(row.payloadJson, BUILT_IN_UI_THEME_PRESETS[0].payload)
   );
-  const payload: UiThemePresetPayload = {
+  const mergedPayload: UiThemePresetPayload = {
     ...validatedPayload,
     lightTokens: {
       ...DEFAULT_UI_THEME_PAYLOAD.lightTokens,
@@ -59,6 +60,11 @@ function rowToPreset(row: UiThemePresetRow): UiThemePreset {
       ...validatedPayload.darkTokens,
     },
   };
+  const payload = resolveUiThemePresetPayload({
+    presetId: row.id,
+    builtIn: row.builtIn,
+    storedPayload: mergedPayload,
+  });
   return {
     presetId: row.id,
     ownerId: row.ownerId,
diff --git a/shared/types/ui-theme.ts b/shared/types/ui-theme.ts
index 1249b133..abeaf4fd 100644
--- a/shared/types/ui-theme.ts
+++ b/shared/types/ui-theme.ts
@@ -81,7 +81,7 @@ const LIGHT_TOKENS_BASE: UiThemeTokenMap = {
   "--ts-shadow-strong": "0 18px 36px rgba(6, 23, 34, 0.28)",
   "--ts-body-bg-grad-a": "rgba(20, 69, 84, 0.18)",
   "--ts-body-bg-grad-b": "rgba(18, 56, 71, 0.22)",
-  "--ts-left-rail-bg": "linear-gradient(180deg, rgba(255, 255, 255, 0.72), rgba(245, 251, 255, 0.66))",
+  "--ts-left-rail-bg": "linear-gradient(180deg, #ffffff, #f5fbff)",
   "--ts-left-rail-inset-shadow": "inset -1px 0 0 rgba(255, 255, 255, 0.3)",
   "--ts-chat-window-overlay-top": "rgba(9, 24, 34, 0.56)",
   "--ts-chat-window-overlay-mid": "rgba(8, 18, 27, 0.36)",
@@ -141,7 +141,7 @@ const DARK_TOKENS_BASE: UiThemeTokenMap = {
   "--ts-shadow-strong": "0 18px 40px rgba(0, 0, 0, 0.46)",
   "--ts-body-bg-grad-a": "rgba(55, 68, 84, 0.18)",
   "--ts-body-bg-grad-b": "rgba(39, 52, 66, 0.2)",
-  "--ts-left-rail-bg": "linear-gradient(180deg, rgba(24, 28, 34, 0.9), rgba(16, 20, 25, 0.88))",
+  "--ts-left-rail-bg": "linear-gradient(180deg, #181c22, #101419)",
   "--ts-left-rail-inset-shadow": "inset -1px 0 0 rgba(255, 255, 255, 0.05)",
   "--ts-chat-window-overlay-top": "rgba(10, 13, 18, 0.72)",
   "--ts-chat-window-overlay-mid": "rgba(9, 12, 17, 0.56)",
diff --git a/web/src/features/sidebars/app-settings/theme-field-metadata.test.ts b/web/src/features/sidebars/app-settings/theme-field-metadata.test.ts
new file mode 100644
index 00000000..2c594563
--- /dev/null
+++ b/web/src/features/sidebars/app-settings/theme-field-metadata.test.ts
@@ -0,0 +1,24 @@
+import { DEFAULT_UI_THEME_MARKDOWN, DEFAULT_UI_THEME_PAYLOAD, DEFAULT_UI_THEME_TYPOGRAPHY } from "@shared/types/ui-theme";
+import { describe, expect, it } from "vitest";
+
+import { THEME_MARKDOWN_META, THEME_TOKEN_META, THEME_TYPOGRAPHY_META } from "./theme-field-metadata";
+
+describe("theme field metadata", () => {
+  it("covers every light theme token", () => {
+    expect(Object.keys(THEME_TOKEN_META).sort()).toEqual(
+      Object.keys(DEFAULT_UI_THEME_PAYLOAD.lightTokens).sort(),
+    );
+  });
+
+  it("covers every typography field", () => {
+    expect(Object.keys(THEME_TYPOGRAPHY_META).sort()).toEqual(
+      Object.keys(DEFAULT_UI_THEME_TYPOGRAPHY).sort(),
+    );
+  });
+
+  it("covers every markdown field", () => {
+    expect(Object.keys(THEME_MARKDOWN_META).sort()).toEqual(
+      Object.keys(DEFAULT_UI_THEME_MARKDOWN).sort(),
+    );
+  });
+});
diff --git a/web/src/features/sidebars/app-settings/theme-field-metadata.ts b/web/src/features/sidebars/app-settings/theme-field-metadata.ts
new file mode 100644
index 00000000..f8fad808
--- /dev/null
+++ b/web/src/features/sidebars/app-settings/theme-field-metadata.ts
@@ -0,0 +1,292 @@
+export const THEME_TOKEN_META: Record<string, { labelKey: string; descriptionKey: string }> = {
+  "--ts-surface": {
+    labelKey: "appSettings.theming.fields.tokens.surface.label",
+    descriptionKey: "appSettings.theming.fields.tokens.surface.description",
+  },
+  "--ts-surface-elevated": {
+    labelKey: "appSettings.theming.fields.tokens.surfaceElevated.label",
+    descriptionKey: "appSettings.theming.fields.tokens.surfaceElevated.description",
+  },
+  "--ts-border-soft": {
+    labelKey: "appSettings.theming.fields.tokens.borderSoft.label",
+    descriptionKey: "appSettings.theming.fields.tokens.borderSoft.description",
+  },
+  "--ts-accent": {
+    labelKey: "appSettings.theming.fields.tokens.accent.label",
+    descriptionKey: "appSettings.theming.fields.tokens.accent.description",
+  },
+  "--ts-accent-soft": {
+    labelKey: "appSettings.theming.fields.tokens.accentSoft.label",
+    descriptionKey: "appSettings.theming.fields.tokens.accentSoft.description",
+  },
+  "--ts-overlay": {
+    labelKey: "appSettings.theming.fields.tokens.overlay.label",
+    descriptionKey: "appSettings.theming.fields.tokens.overlay.description",
+  },
+  "--ts-shadow-soft": {
+    labelKey: "appSettings.theming.fields.tokens.shadowSoft.label",
+    descriptionKey: "appSettings.theming.fields.tokens.shadowSoft.description",
+  },
+  "--ts-shadow-strong": {
+    labelKey: "appSettings.theming.fields.tokens.shadowStrong.label",
+    descriptionKey: "appSettings.theming.fields.tokens.shadowStrong.description",
+  },
+  "--ts-body-bg-grad-a": {
+    labelKey: "appSettings.theming.fields.tokens.bodyBgGradA.label",
+    descriptionKey: "appSettings.theming.fields.tokens.bodyBgGradA.description",
+  },
+  "--ts-body-bg-grad-b": {
+    labelKey: "appSettings.theming.fields.tokens.bodyBgGradB.label",
+    descriptionKey: "appSettings.theming.fields.tokens.bodyBgGradB.description",
+  },
+  "--ts-left-rail-bg": {
+    labelKey: "appSettings.theming.fields.tokens.leftRailBg.label",
+    descriptionKey: "appSettings.theming.fields.tokens.leftRailBg.description",
+  },
+  "--ts-left-rail-inset-shadow": {
+    labelKey: "appSettings.theming.fields.tokens.leftRailInsetShadow.label",
+    descriptionKey: "appSettings.theming.fields.tokens.leftRailInsetShadow.description",
+  },
+  "--ts-chat-window-overlay-top": {
+    labelKey: "appSettings.theming.fields.tokens.chatWindowOverlayTop.label",
+    descriptionKey: "appSettings.theming.fields.tokens.chatWindowOverlayTop.description",
+  },
+  "--ts-chat-window-overlay-mid": {
+    labelKey: "appSettings.theming.fields.tokens.chatWindowOverlayMid.label",
+    descriptionKey: "appSettings.theming.fields.tokens.chatWindowOverlayMid.description",
+  },
+  "--ts-chat-window-overlay-bottom": {
+    labelKey: "appSettings.theming.fields.tokens.chatWindowOverlayBottom.label",
+    descriptionKey: "appSettings.theming.fields.tokens.chatWindowOverlayBottom.description",
+  },
+  "--ts-chat-window-radial-a": {
+    labelKey: "appSettings.theming.fields.tokens.chatWindowRadialA.label",
+    descriptionKey: "appSettings.theming.fields.tokens.chatWindowRadialA.description",
+  },
+  "--ts-chat-window-radial-b": {
+    labelKey: "appSettings.theming.fields.tokens.chatWindowRadialB.label",
+    descriptionKey: "appSettings.theming.fields.tokens.chatWindowRadialB.description",
+  },
+  "--ts-chat-scroll-bg-top": {
+    labelKey: "appSettings.theming.fields.tokens.chatScrollBgTop.label",
+    descriptionKey: "appSettings.theming.fields.tokens.chatScrollBgTop.description",
+  },
+  "--ts-chat-scroll-bg-bottom": {
+    labelKey: "appSettings.theming.fields.tokens.chatScrollBgBottom.label",
+    descriptionKey: "appSettings.theming.fields.tokens.chatScrollBgBottom.description",
+  },
+  "--ts-chat-header-border": {
+    labelKey: "appSettings.theming.fields.tokens.chatHeaderBorder.label",
+    descriptionKey: "appSettings.theming.fields.tokens.chatHeaderBorder.description",
+  },
+  "--ts-message-assistant-bg": {
+    labelKey: "appSettings.theming.fields.tokens.messageAssistantBg.label",
+    descriptionKey: "appSettings.theming.fields.tokens.messageAssistantBg.description",
+  },
+  "--ts-message-user-bg": {
+    labelKey: "appSettings.theming.fields.tokens.messageUserBg.label",
+    descriptionKey: "appSettings.theming.fields.tokens.messageUserBg.description",
+  },
+  "--ts-message-user-border": {
+    labelKey: "appSettings.theming.fields.tokens.messageUserBorder.label",
+    descriptionKey: "appSettings.theming.fields.tokens.messageUserBorder.description",
+  },
+  "--ts-message-assistant-name": {
+    labelKey: "appSettings.theming.fields.tokens.messageAssistantName.label",
+    descriptionKey: "appSettings.theming.fields.tokens.messageAssistantName.description",
+  },
+  "--ts-message-user-name": {
+    labelKey: "appSettings.theming.fields.tokens.messageUserName.label",
+    descriptionKey: "appSettings.theming.fields.tokens.messageUserName.description",
+  },
+  "--ts-message-token-color": {
+    labelKey: "appSettings.theming.fields.tokens.messageTokenColor.label",
+    descriptionKey: "appSettings.theming.fields.tokens.messageTokenColor.description",
+  },
+  "--ts-chat-avatar-preview-bg": {
+    labelKey: "appSettings.theming.fields.tokens.chatAvatarPreviewBg.label",
+    descriptionKey: "appSettings.theming.fields.tokens.chatAvatarPreviewBg.description",
+  },
+  "--ts-sidebar-card-bg": {
+    labelKey: "appSettings.theming.fields.tokens.sidebarCardBg.label",
+    descriptionKey: "appSettings.theming.fields.tokens.sidebarCardBg.description",
+  },
+  "--ts-sidebar-card-hover-border": {
+    labelKey: "appSettings.theming.fields.tokens.sidebarCardHoverBorder.label",
+    descriptionKey: "appSettings.theming.fields.tokens.sidebarCardHoverBorder.description",
+  },
+  "--ts-md-code-bg": {
+    labelKey: "appSettings.theming.fields.tokens.markdownCodeBg.label",
+    descriptionKey: "appSettings.theming.fields.tokens.markdownCodeBg.description",
+  },
+  "--ts-md-quote-color": {
+    labelKey: "appSettings.theming.fields.tokens.markdownQuoteColor.label",
+    descriptionKey: "appSettings.theming.fields.tokens.markdownQuoteColor.description",
+  },
+  "--ts-md-link-decoration-color": {
+    labelKey: "appSettings.theming.fields.tokens.markdownLinkDecorationColor.label",
+    descriptionKey: "appSettings.theming.fields.tokens.markdownLinkDecorationColor.description",
+  },
+  "--ts-scrollbar-thumb": {
+    labelKey: "appSettings.theming.fields.tokens.scrollbarThumb.label",
+    descriptionKey: "appSettings.theming.fields.tokens.scrollbarThumb.description",
+  },
+  "--ts-input-bg": {
+    labelKey: "appSettings.theming.fields.tokens.inputBg.label",
+    descriptionKey: "appSettings.theming.fields.tokens.inputBg.description",
+  },
+  "--ts-node-group-border": {
+    labelKey: "appSettings.theming.fields.tokens.nodeGroupBorder.label",
+    descriptionKey: "appSettings.theming.fields.tokens.nodeGroupBorder.description",
+  },
+  "--ts-node-group-border-active": {
+    labelKey: "appSettings.theming.fields.tokens.nodeGroupBorderActive.label",
+    descriptionKey: "appSettings.theming.fields.tokens.nodeGroupBorderActive.description",
+  },
+  "--ts-node-group-shadow-active": {
+    labelKey: "appSettings.theming.fields.tokens.nodeGroupShadowActive.label",
+    descriptionKey: "appSettings.theming.fields.tokens.nodeGroupShadowActive.description",
+  },
+  "--ts-node-group-badge-shadow": {
+    labelKey: "appSettings.theming.fields.tokens.nodeGroupBadgeShadow.label",
+    descriptionKey: "appSettings.theming.fields.tokens.nodeGroupBadgeShadow.description",
+  },
+  "--ts-node-group-editor-border": {
+    labelKey: "appSettings.theming.fields.tokens.nodeGroupEditorBorder.label",
+    descriptionKey: "appSettings.theming.fields.tokens.nodeGroupEditorBorder.description",
+  },
+  "--op-surface": {
+    labelKey: "appSettings.theming.fields.tokens.opSurface.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opSurface.description",
+  },
+  "--op-surface-muted": {
+    labelKey: "appSettings.theming.fields.tokens.opSurfaceMuted.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opSurfaceMuted.description",
+  },
+  "--op-border": {
+    labelKey: "appSettings.theming.fields.tokens.opBorder.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opBorder.description",
+  },
+  "--op-border-strong": {
+    labelKey: "appSettings.theming.fields.tokens.opBorderStrong.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opBorderStrong.description",
+  },
+  "--op-muted": {
+    labelKey: "appSettings.theming.fields.tokens.opMuted.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opMuted.description",
+  },
+  "--op-accent": {
+    labelKey: "appSettings.theming.fields.tokens.opAccent.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opAccent.description",
+  },
+  "--op-accent-soft": {
+    labelKey: "appSettings.theming.fields.tokens.opAccentSoft.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opAccentSoft.description",
+  },
+  "--op-success": {
+    labelKey: "appSettings.theming.fields.tokens.opSuccess.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opSuccess.description",
+  },
+  "--op-warn": {
+    labelKey: "appSettings.theming.fields.tokens.opWarn.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opWarn.description",
+  },
+  "--op-danger": {
+    labelKey: "appSettings.theming.fields.tokens.opDanger.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opDanger.description",
+  },
+  "--op-shadow": {
+    labelKey: "appSettings.theming.fields.tokens.opShadow.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opShadow.description",
+  },
+  "--op-bg-gradient-start": {
+    labelKey: "appSettings.theming.fields.tokens.opBgGradientStart.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opBgGradientStart.description",
+  },
+  "--op-bg-gradient-end": {
+    labelKey: "appSettings.theming.fields.tokens.opBgGradientEnd.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opBgGradientEnd.description",
+  },
+  "--op-list-row-bg": {
+    labelKey: "appSettings.theming.fields.tokens.opListRowBg.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opListRowBg.description",
+  },
+  "--op-node-surface": {
+    labelKey: "appSettings.theming.fields.tokens.opNodeSurface.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opNodeSurface.description",
+  },
+  "--op-node-border": {
+    labelKey: "appSettings.theming.fields.tokens.opNodeBorder.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opNodeBorder.description",
+  },
+  "--op-node-shadow": {
+    labelKey: "appSettings.theming.fields.tokens.opNodeShadow.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opNodeShadow.description",
+  },
+  "--op-node-toolbar-bg": {
+    labelKey: "appSettings.theming.fields.tokens.opNodeToolbarBg.label",
+    descriptionKey: "appSettings.theming.fields.tokens.opNodeToolbarBg.description",
+  },
+};
+
+export const THEME_TYPOGRAPHY_META = {
+  uiFontFamily: {
+    labelKey: "appSettings.theming.fields.typography.uiFontFamily.label",
+    descriptionKey: "appSettings.theming.fields.typography.uiFontFamily.description",
+  },
+  chatFontFamily: {
+    labelKey: "appSettings.theming.fields.typography.chatFontFamily.label",
+    descriptionKey: "appSettings.theming.fields.typography.chatFontFamily.description",
+  },
+  uiBaseFontSize: {
+    labelKey: "appSettings.theming.fields.typography.uiBaseFontSize.label",
+    descriptionKey: "appSettings.theming.fields.typography.uiBaseFontSize.description",
+  },
+  chatBaseFontSize: {
+    labelKey: "appSettings.theming.fields.typography.chatBaseFontSize.label",
+    descriptionKey: "appSettings.theming.fields.typography.chatBaseFontSize.description",
+  },
+  radiusXs: {
+    labelKey: "appSettings.theming.fields.typography.radiusXs.label",
+    descriptionKey: "appSettings.theming.fields.typography.radiusXs.description",
+  },
+  radiusSm: {
+    labelKey: "appSettings.theming.fields.typography.radiusSm.label",
+    descriptionKey: "appSettings.theming.fields.typography.radiusSm.description",
+  },
+  radiusMd: {
+    labelKey: "appSettings.theming.fields.typography.radiusMd.label",
+    descriptionKey: "appSettings.theming.fields.typography.radiusMd.description",
+  },
+  radiusLg: {
+    labelKey: "appSettings.theming.fields.typography.radiusLg.label",
+    descriptionKey: "appSettings.theming.fields.typography.radiusLg.description",
+  },
+  radiusXl: {
+    labelKey: "appSettings.theming.fields.typography.radiusXl.label",
+    descriptionKey: "appSettings.theming.fields.typography.radiusXl.description",
+  },
+} as const;
+
+export const THEME_MARKDOWN_META = {
+  fontSize: {
+    labelKey: "appSettings.theming.fields.markdown.fontSize.label",
+    descriptionKey: "appSettings.theming.fields.markdown.fontSize.description",
+  },
+  lineHeight: {
+    labelKey: "appSettings.theming.fields.markdown.lineHeight.label",
+    descriptionKey: "appSettings.theming.fields.markdown.lineHeight.description",
+  },
+  codeFontSize: {
+    labelKey: "appSettings.theming.fields.markdown.codeFontSize.label",
+    descriptionKey: "appSettings.theming.fields.markdown.codeFontSize.description",
+  },
+  codePadding: {
+    labelKey: "appSettings.theming.fields.markdown.codePadding.label",
+    descriptionKey: "appSettings.theming.fields.markdown.codePadding.description",
+  },
+  quoteBorderWidth: {
+    labelKey: "appSettings.theming.fields.markdown.quoteBorderWidth.label",
+    descriptionKey: "appSettings.theming.fields.markdown.quoteBorderWidth.description",
+  },
+} as const;
diff --git a/web/src/features/sidebars/app-settings/theme-preset-accordion.tsx b/web/src/features/sidebars/app-settings/theme-preset-accordion.tsx
index 68e64fdb..987803a0 100644
--- a/web/src/features/sidebars/app-settings/theme-preset-accordion.tsx
+++ b/web/src/features/sidebars/app-settings/theme-preset-accordion.tsx
@@ -1,261 +1,213 @@
 import { Accordion, Stack, Text, TextInput, Textarea } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
+import {
+  THEME_MARKDOWN_META,
+  THEME_TOKEN_META,
+  THEME_TYPOGRAPHY_META,
+} from "./theme-field-metadata";
+
 import type { UiThemePresetDto } from "../../../api/ui-theme";
+import type { UiThemeMarkdown, UiThemeTokenMap, UiThemeTypography } from "@shared/types/ui-theme";
 
 type ThemePresetAccordionProps = {
   draftPreset: UiThemePresetDto;
   onChange: (next: UiThemePresetDto) => void;
 };
 
-type ThemeSectionProps = ThemePresetAccordionProps;
-
-const ThemeTokenSection = ({ draftPreset, onChange }: ThemeSectionProps) => {
+function ThemeTokenInputs(props: {
+  tokens: UiThemeTokenMap;
+  disabled: boolean;
+  onChange: (next: UiThemeTokenMap) => void;
+}) {
   const { t } = useTranslation();
 
   return (
-    <>
-      <Accordion.Item value="light">
-        <Accordion.Control>{t("appSettings.theming.lightTokens")}</Accordion.Control>
-      <Accordion.Panel>
-        <Stack gap="xs">
-          {Object.entries(draftPreset.payload.lightTokens).map(([key, value]) => (
-            <TextInput
-              key={`light-${key}`}
-              label={key}
-              value={value}
-              onChange={(event) =>
-                onChange({
-                  ...draftPreset,
-                  payload: {
-                    ...draftPreset.payload,
-                    lightTokens: {
-                      ...draftPreset.payload.lightTokens,
-                      [key]: event.currentTarget.value,
-                    },
-                  },
-                })
-              }
-              disabled={draftPreset.builtIn}
-            />
-          ))}
-        </Stack>
-      </Accordion.Panel>
-      </Accordion.Item>
-
-      <Accordion.Item value="dark">
-        <Accordion.Control>{t("appSettings.theming.darkTokens")}</Accordion.Control>
-      <Accordion.Panel>
-        <Stack gap="xs">
-          {Object.entries(draftPreset.payload.darkTokens).map(([key, value]) => (
-            <TextInput
-              key={`dark-${key}`}
-              label={key}
-              value={value}
-              onChange={(event) =>
-                onChange({
-                  ...draftPreset,
-                  payload: {
-                    ...draftPreset.payload,
-                    darkTokens: {
-                      ...draftPreset.payload.darkTokens,
-                      [key]: event.currentTarget.value,
-                    },
-                  },
-                })
-              }
-              disabled={draftPreset.builtIn}
-            />
-          ))}
-        </Stack>
-      </Accordion.Panel>
-      </Accordion.Item>
-    </>
+    <Stack gap="xs">
+      {Object.entries(props.tokens).map(([key, value]) => {
+        const meta = THEME_TOKEN_META[key];
+        return (
+          <TextInput
+            key={key}
+            label={meta ? t(meta.labelKey) : key}
+            description={
+              meta ? t(meta.descriptionKey, { variable: key }) : key
+            }
+            value={value}
+            onChange={(event) =>
+              props.onChange({
+                ...props.tokens,
+                [key]: event.currentTarget.value,
+              })
+            }
+            disabled={props.disabled}
+          />
+        );
+      })}
+    </Stack>
   );
-};
+}
 
-const ThemeTypographySection = ({ draftPreset, onChange }: ThemeSectionProps) => {
+function ThemeTypographyInputs(props: {
+  typography: UiThemeTypography;
+  disabled: boolean;
+  onChange: (next: UiThemeTypography) => void;
+}) {
   const { t } = useTranslation();
 
   return (
-    <Accordion.Item value="typography">
-      <Accordion.Control>{t("appSettings.theming.typography")}</Accordion.Control>
-    <Accordion.Panel>
-      <Stack gap="xs">
-        <TextInput
-          label="uiFontFamily"
-          value={draftPreset.payload.typography.uiFontFamily}
-          onChange={(event) =>
-            onChange({
-              ...draftPreset,
-              payload: {
-                ...draftPreset.payload,
-                typography: {
-                  ...draftPreset.payload.typography,
-                  uiFontFamily: event.currentTarget.value,
-                },
-              },
-            })
-          }
-          disabled={draftPreset.builtIn}
-        />
-        <TextInput
-          label="chatFontFamily"
-          value={draftPreset.payload.typography.chatFontFamily}
-          onChange={(event) =>
-            onChange({
-              ...draftPreset,
-              payload: {
-                ...draftPreset.payload,
-                typography: {
-                  ...draftPreset.payload.typography,
-                  chatFontFamily: event.currentTarget.value,
-                },
-              },
-            })
-          }
-          disabled={draftPreset.builtIn}
-        />
-        <TextInput
-          label="uiBaseFontSize"
-          value={draftPreset.payload.typography.uiBaseFontSize}
-          onChange={(event) =>
-            onChange({
-              ...draftPreset,
-              payload: {
-                ...draftPreset.payload,
-                typography: {
-                  ...draftPreset.payload.typography,
-                  uiBaseFontSize: event.currentTarget.value,
-                },
-              },
-            })
-          }
-          disabled={draftPreset.builtIn}
-        />
+    <Stack gap="xs">
+      {Object.entries(THEME_TYPOGRAPHY_META).map(([key, meta]) => (
         <TextInput
-          label="chatBaseFontSize"
-          value={draftPreset.payload.typography.chatBaseFontSize}
+          key={key}
+          label={t(meta.labelKey)}
+          description={t(meta.descriptionKey)}
+          value={props.typography[key as keyof UiThemeTypography]}
           onChange={(event) =>
-            onChange({
-              ...draftPreset,
-              payload: {
-                ...draftPreset.payload,
-                typography: {
-                  ...draftPreset.payload.typography,
-                  chatBaseFontSize: event.currentTarget.value,
-                },
-              },
+            props.onChange({
+              ...props.typography,
+              [key]: event.currentTarget.value,
             })
           }
-          disabled={draftPreset.builtIn}
+          disabled={props.disabled}
         />
-      </Stack>
-    </Accordion.Panel>
-    </Accordion.Item>
+      ))}
+    </Stack>
   );
-};
+}
 
-const ThemeMarkdownSection = ({ draftPreset, onChange }: ThemeSectionProps) => {
+function ThemeMarkdownInputs(props: {
+  markdown: UiThemeMarkdown;
+  disabled: boolean;
+  onChange: (next: UiThemeMarkdown) => void;
+}) {
   const { t } = useTranslation();
 
   return (
-    <Accordion.Item value="markdown">
-      <Accordion.Control>{t("appSettings.theming.markdown")}</Accordion.Control>
-    <Accordion.Panel>
-      <Stack gap="xs">
+    <Stack gap="xs">
+      {Object.entries(THEME_MARKDOWN_META).map(([key, meta]) => (
         <TextInput
-          label="fontSize"
-          value={draftPreset.payload.markdown.fontSize}
+          key={key}
+          label={t(meta.labelKey)}
+          description={t(meta.descriptionKey)}
+          value={props.markdown[key as keyof UiThemeMarkdown]}
           onChange={(event) =>
-            onChange({
-              ...draftPreset,
-              payload: {
-                ...draftPreset.payload,
-                markdown: {
-                  ...draftPreset.payload.markdown,
-                  fontSize: event.currentTarget.value,
-                },
-              },
+            props.onChange({
+              ...props.markdown,
+              [key]: event.currentTarget.value,
             })
           }
-          disabled={draftPreset.builtIn}
+          disabled={props.disabled}
         />
-        <TextInput
-          label="lineHeight"
-          value={draftPreset.payload.markdown.lineHeight}
-          onChange={(event) =>
-            onChange({
-              ...draftPreset,
-              payload: {
-                ...draftPreset.payload,
-                markdown: {
-                  ...draftPreset.payload.markdown,
-                  lineHeight: event.currentTarget.value,
-                },
-              },
-            })
-          }
-          disabled={draftPreset.builtIn}
-        />
-        <TextInput
-          label="codeFontSize"
-          value={draftPreset.payload.markdown.codeFontSize}
-          onChange={(event) =>
-            onChange({
-              ...draftPreset,
-              payload: {
-                ...draftPreset.payload,
-                markdown: {
-                  ...draftPreset.payload.markdown,
-                  codeFontSize: event.currentTarget.value,
-                },
-              },
-            })
-          }
-          disabled={draftPreset.builtIn}
-        />
-      </Stack>
-    </Accordion.Panel>
-    </Accordion.Item>
+      ))}
+    </Stack>
   );
-};
+}
 
-const ThemeCssSection = ({ draftPreset, onChange }: ThemeSectionProps) => {
+export const ThemePresetAccordion = ({ draftPreset, onChange }: ThemePresetAccordionProps) => {
   const { t } = useTranslation();
 
-  return (
-    <Accordion.Item value="css">
-      <Accordion.Control>{t("appSettings.theming.customCss")}</Accordion.Control>
-      <Accordion.Panel>
-        <Textarea
-          value={draftPreset.payload.customCss}
-          onChange={(event) =>
-            onChange({
-              ...draftPreset,
-              payload: { ...draftPreset.payload, customCss: event.currentTarget.value },
-            })
-          }
-          autosize
-          minRows={8}
-          maxRows={18}
-          disabled={draftPreset.builtIn}
-        />
-        <Text size="xs" c="dimmed" mt={6}>
-          {t("appSettings.theming.customCssHint")}
-        </Text>
-      </Accordion.Panel>
-    </Accordion.Item>
-  );
-};
-
-export const ThemePresetAccordion = ({ draftPreset, onChange }: ThemePresetAccordionProps) => {
   return (
     <Accordion variant="separated" defaultValue="light">
-      <ThemeTokenSection draftPreset={draftPreset} onChange={onChange} />
-      <ThemeTypographySection draftPreset={draftPreset} onChange={onChange} />
-      <ThemeMarkdownSection draftPreset={draftPreset} onChange={onChange} />
-      <ThemeCssSection draftPreset={draftPreset} onChange={onChange} />
+      <Accordion.Item value="light">
+        <Accordion.Control>{t("appSettings.theming.lightTokens")}</Accordion.Control>
+        <Accordion.Panel>
+          <ThemeTokenInputs
+            tokens={draftPreset.payload.lightTokens}
+            disabled={draftPreset.builtIn}
+            onChange={(lightTokens) =>
+              onChange({
+                ...draftPreset,
+                payload: {
+                  ...draftPreset.payload,
+                  lightTokens,
+                },
+              })
+            }
+          />
+        </Accordion.Panel>
+      </Accordion.Item>
+
+      <Accordion.Item value="dark">
+        <Accordion.Control>{t("appSettings.theming.darkTokens")}</Accordion.Control>
+        <Accordion.Panel>
+          <ThemeTokenInputs
+            tokens={draftPreset.payload.darkTokens}
+            disabled={draftPreset.builtIn}
+            onChange={(darkTokens) =>
+              onChange({
+                ...draftPreset,
+                payload: {
+                  ...draftPreset.payload,
+                  darkTokens,
+                },
+              })
+            }
+          />
+        </Accordion.Panel>
+      </Accordion.Item>
+
+      <Accordion.Item value="typography">
+        <Accordion.Control>{t("appSettings.theming.typography")}</Accordion.Control>
+        <Accordion.Panel>
+          <ThemeTypographyInputs
+            typography={draftPreset.payload.typography}
+            disabled={draftPreset.builtIn}
+            onChange={(typography) =>
+              onChange({
+                ...draftPreset,
+                payload: {
+                  ...draftPreset.payload,
+                  typography,
+                },
+              })
+            }
+          />
+        </Accordion.Panel>
+      </Accordion.Item>
+
+      <Accordion.Item value="markdown">
+        <Accordion.Control>{t("appSettings.theming.markdown")}</Accordion.Control>
+        <Accordion.Panel>
+          <ThemeMarkdownInputs
+            markdown={draftPreset.payload.markdown}
+            disabled={draftPreset.builtIn}
+            onChange={(markdown) =>
+              onChange({
+                ...draftPreset,
+                payload: {
+                  ...draftPreset.payload,
+                  markdown,
+                },
+              })
+            }
+          />
+        </Accordion.Panel>
+      </Accordion.Item>
+
+      <Accordion.Item value="css">
+        <Accordion.Control>{t("appSettings.theming.customCss")}</Accordion.Control>
+        <Accordion.Panel>
+          <Textarea
+            label={t("appSettings.theming.fields.customCss.label")}
+            description={t("appSettings.theming.fields.customCss.description")}
+            value={draftPreset.payload.customCss}
+            onChange={(event) =>
+              onChange({
+                ...draftPreset,
+                payload: { ...draftPreset.payload, customCss: event.currentTarget.value },
+              })
+            }
+            autosize
+            minRows={8}
+            maxRows={18}
+            disabled={draftPreset.builtIn}
+          />
+          <Text size="xs" c="dimmed" mt={6}>
+            {t("appSettings.theming.customCssHint")}
+          </Text>
+        </Accordion.Panel>
+      </Accordion.Item>
     </Accordion>
   );
 };
diff --git a/web/src/i18n/resources/en/appSettings.ts b/web/src/i18n/resources/en/appSettings.ts
index 71fa7c22..b71d7926 100644
--- a/web/src/i18n/resources/en/appSettings.ts
+++ b/web/src/i18n/resources/en/appSettings.ts
@@ -24,6 +24,89 @@
 				markdown: 'Markdown style',
 				customCss: 'Custom CSS',
 				customCssHint: 'CSS is automatically scoped to the app shell.',
+				fields: {
+					tokens: {
+						surface: { label: 'Base surface', description: '{{variable}}. Main background for the app shell and panels.' },
+						surfaceElevated: { label: 'Elevated surface', description: '{{variable}}. Background for raised panels and popovers.' },
+						borderSoft: { label: 'Soft border', description: '{{variable}}. Default color for thin borders and separators.' },
+						accent: { label: 'Accent', description: '{{variable}}. Primary accent color used across the app.' },
+						accentSoft: { label: 'Soft accent', description: '{{variable}}. Muted accent fill for hover and soft emphasis states.' },
+						overlay: { label: 'Overlay', description: '{{variable}}. Backdrop tint for modal and overlay layers.' },
+						shadowSoft: { label: 'Soft shadow', description: '{{variable}}. Light shadow for cards and elevated surfaces.' },
+						shadowStrong: { label: 'Strong shadow', description: '{{variable}}. Deeper shadow for prominent elements.' },
+						bodyBgGradA: { label: 'Body gradient A', description: '{{variable}}. First decorative color in the global app background.' },
+						bodyBgGradB: { label: 'Body gradient B', description: '{{variable}}. Second decorative color in the global app background.' },
+						leftRailBg: { label: 'Left rail background', description: '{{variable}}. Fill of the left navigation rail.' },
+						leftRailInsetShadow: { label: 'Left rail inset shadow', description: '{{variable}}. Inner divider/shadow along the rail edge.' },
+						chatWindowOverlayTop: { label: 'Chat overlay top', description: '{{variable}}. Top segment of the chat background overlay.' },
+						chatWindowOverlayMid: { label: 'Chat overlay middle', description: '{{variable}}. Middle segment of the chat background overlay.' },
+						chatWindowOverlayBottom: { label: 'Chat overlay bottom', description: '{{variable}}. Bottom segment of the chat background overlay.' },
+						chatWindowRadialA: { label: 'Chat radial glow A', description: '{{variable}}. First decorative radial glow above the chat background.' },
+						chatWindowRadialB: { label: 'Chat radial glow B', description: '{{variable}}. Second decorative radial glow above the chat background.' },
+						chatScrollBgTop: { label: 'Chat scroll background top', description: '{{variable}}. Top color of the message list container background.' },
+						chatScrollBgBottom: { label: 'Chat scroll background bottom', description: '{{variable}}. Bottom color of the message list container background.' },
+						chatHeaderBorder: { label: 'Chat header border', description: '{{variable}}. Divider color for chat header areas.' },
+						messageAssistantBg: { label: 'Assistant message background', description: '{{variable}}. Bubble/card background for assistant messages.' },
+						messageUserBg: { label: 'User message background', description: '{{variable}}. Bubble/card background for user messages.' },
+						messageUserBorder: { label: 'User message border', description: '{{variable}}. Border color for user message cards.' },
+						messageAssistantName: { label: 'Assistant name color', description: '{{variable}}. Color of assistant role/name text in messages.' },
+						messageUserName: { label: 'User name color', description: '{{variable}}. Color of user role/name text in messages.' },
+						messageTokenColor: { label: 'Token badge color', description: '{{variable}}. Text color for token counters and similar badges.' },
+						chatAvatarPreviewBg: { label: 'Avatar preview background', description: '{{variable}}. Background of the avatar preview panel.' },
+						sidebarCardBg: { label: 'Sidebar card background', description: '{{variable}}. Base background for cards inside sidebars.' },
+						sidebarCardHoverBorder: { label: 'Sidebar card hover border', description: '{{variable}}. Hover highlight border for sidebar cards.' },
+						markdownCodeBg: { label: 'Markdown code background', description: '{{variable}}. Background for inline code in markdown.' },
+						markdownQuoteColor: { label: 'Markdown quote color', description: '{{variable}}. Accent color used for markdown quotes.' },
+						markdownLinkDecorationColor: { label: 'Markdown link decoration', description: '{{variable}}. Decoration color for markdown links.' },
+						scrollbarThumb: { label: 'Scrollbar thumb', description: '{{variable}}. Color of the draggable scrollbar thumb.' },
+						inputBg: { label: 'Input background', description: '{{variable}}. Background fill for text inputs and editors.' },
+						nodeGroupBorder: { label: 'Node group border', description: '{{variable}}. Default border for operation graph groups.' },
+						nodeGroupBorderActive: { label: 'Node group active border', description: '{{variable}}. Active highlight border for operation graph groups.' },
+						nodeGroupShadowActive: { label: 'Node group active shadow', description: '{{variable}}. Active shadow glow for operation graph groups.' },
+						nodeGroupBadgeShadow: { label: 'Node group badge shadow', description: '{{variable}}. Shadow used under group badges.' },
+						nodeGroupEditorBorder: { label: 'Node group editor border', description: '{{variable}}. Border for the group settings editor.' },
+						opSurface: { label: 'Operation surface', description: '{{variable}}. Base background for the operations UI.' },
+						opSurfaceMuted: { label: 'Muted operation surface', description: '{{variable}}. Secondary surface inside the operations UI.' },
+						opBorder: { label: 'Operation border', description: '{{variable}}. Default border color in the operations editor.' },
+						opBorderStrong: { label: 'Strong operation border', description: '{{variable}}. Stronger border for emphasized operation blocks.' },
+						opMuted: { label: 'Muted operation text', description: '{{variable}}. Secondary text color in the operations UI.' },
+						opAccent: { label: 'Operation accent', description: '{{variable}}. Primary accent color in the operations editor.' },
+						opAccentSoft: { label: 'Soft operation accent', description: '{{variable}}. Soft accent fill for operations UI highlights.' },
+						opSuccess: { label: 'Operation success', description: '{{variable}}. Success state color in the operations UI.' },
+						opWarn: { label: 'Operation warning', description: '{{variable}}. Warning state color in the operations UI.' },
+						opDanger: { label: 'Operation danger', description: '{{variable}}. Error and destructive action color in the operations UI.' },
+						opShadow: { label: 'Operation shadow', description: '{{variable}}. Default shadow for operation cards and panels.' },
+						opBgGradientStart: { label: 'Operation gradient start', description: '{{variable}}. Start color of the operations UI background gradient.' },
+						opBgGradientEnd: { label: 'Operation gradient end', description: '{{variable}}. End color of the operations UI background gradient.' },
+						opListRowBg: { label: 'Operation list row background', description: '{{variable}}. Background of list rows in the operations editor.' },
+						opNodeSurface: { label: 'Operation node surface', description: '{{variable}}. Background of graph node cards.' },
+						opNodeBorder: { label: 'Operation node border', description: '{{variable}}. Border color of graph node cards.' },
+						opNodeShadow: { label: 'Operation node shadow', description: '{{variable}}. Shadow of graph node cards.' },
+						opNodeToolbarBg: { label: 'Operation node toolbar background', description: '{{variable}}. Background of node header/toolbar areas.' },
+					},
+					typography: {
+						uiFontFamily: { label: 'UI font family', description: 'Font stack used for buttons, menus, panels, and other interface text.' },
+						chatFontFamily: { label: 'Chat font family', description: 'Font stack used for message content and chat text blocks.' },
+						uiBaseFontSize: { label: 'UI base font size', description: 'Base font size for the application interface.' },
+						chatBaseFontSize: { label: 'Chat base font size', description: 'Base font size for messages and chat content.' },
+						radiusXs: { label: 'Radius XS', description: 'Smallest corner radius used for compact UI elements.' },
+						radiusSm: { label: 'Radius SM', description: 'Small corner radius for buttons and small cards.' },
+						radiusMd: { label: 'Radius MD', description: 'Default corner radius for standard panels and controls.' },
+						radiusLg: { label: 'Radius LG', description: 'Large corner radius for prominent containers.' },
+						radiusXl: { label: 'Radius XL', description: 'Largest corner radius for highlighted surfaces and large blocks.' },
+					},
+					markdown: {
+						fontSize: { label: 'Markdown font size', description: 'Font size used for rendered markdown content.' },
+						lineHeight: { label: 'Markdown line height', description: 'Line spacing for rendered markdown content.' },
+						codeFontSize: { label: 'Code font size', description: 'Font size used for inline code and code fragments.' },
+						codePadding: { label: 'Code padding', description: 'Inner spacing used for inline code and code snippets.' },
+						quoteBorderWidth: { label: 'Quote border width', description: 'Thickness of the accent border shown for markdown quotes.' },
+					},
+					customCss: {
+						label: 'Custom CSS',
+						description: 'Additional CSS rules applied inside the app shell scope.',
+					},
+				},
 				actions: {
 					createNew: 'Create new',
 					createCopy: 'Create copy',
diff --git a/web/src/i18n/resources/ru/appSettings.ts b/web/src/i18n/resources/ru/appSettings.ts
index 1c4b7370..3ce08d2e 100644
--- a/web/src/i18n/resources/ru/appSettings.ts
+++ b/web/src/i18n/resources/ru/appSettings.ts
@@ -24,6 +24,89 @@
 				markdown: 'Markdown стиль',
 				customCss: 'Кастомный CSS',
 				customCssHint: 'CSS автоматически ограничивается областью приложения.',
+				fields: {
+					tokens: {
+						surface: { label: 'Базовая поверхность', description: '{{variable}}. Основной фон интерфейса и панелей.' },
+						surfaceElevated: { label: 'Поднятая поверхность', description: '{{variable}}. Фон всплывающих и приподнятых блоков.' },
+						borderSoft: { label: 'Мягкая граница', description: '{{variable}}. Базовый цвет тонких рамок и разделителей.' },
+						accent: { label: 'Акцент', description: '{{variable}}. Основной акцентный цвет приложения.' },
+						accentSoft: { label: 'Мягкий акцент', description: '{{variable}}. Ослабленная акцентная подложка и hover-состояния.' },
+						overlay: { label: 'Оверлей', description: '{{variable}}. Затемнение для модальных и перекрывающих слоёв.' },
+						shadowSoft: { label: 'Мягкая тень', description: '{{variable}}. Лёгкая тень для карточек и поверхностей.' },
+						shadowStrong: { label: 'Сильная тень', description: '{{variable}}. Более глубокая тень для заметных блоков.' },
+						bodyBgGradA: { label: 'Градиент фона A', description: '{{variable}}. Первый декоративный оттенок общего фона приложения.' },
+						bodyBgGradB: { label: 'Градиент фона B', description: '{{variable}}. Второй декоративный оттенок общего фона приложения.' },
+						leftRailBg: { label: 'Фон левого бара', description: '{{variable}}. Заливка левой навигационной панели.' },
+						leftRailInsetShadow: { label: 'Внутренняя тень левого бара', description: '{{variable}}. Внутренняя линия/тень на правом крае левого бара.' },
+						chatWindowOverlayTop: { label: 'Оверлей чата сверху', description: '{{variable}}. Верхняя часть затемнения над фоном чата.' },
+						chatWindowOverlayMid: { label: 'Оверлей чата по центру', description: '{{variable}}. Средняя часть затемнения над фоном чата.' },
+						chatWindowOverlayBottom: { label: 'Оверлей чата снизу', description: '{{variable}}. Нижняя часть затемнения над фоном чата.' },
+						chatWindowRadialA: { label: 'Радиальный свет чата A', description: '{{variable}}. Первый декоративный радиальный блик поверх фона чата.' },
+						chatWindowRadialB: { label: 'Радиальный свет чата B', description: '{{variable}}. Второй декоративный радиальный блик поверх фона чата.' },
+						chatScrollBgTop: { label: 'Фон скролла чата сверху', description: '{{variable}}. Верхняя часть фона контейнера сообщений.' },
+						chatScrollBgBottom: { label: 'Фон скролла чата снизу', description: '{{variable}}. Нижняя часть фона контейнера сообщений.' },
+						chatHeaderBorder: { label: 'Граница шапки чата', description: '{{variable}}. Разделитель в заголовочных зонах чата.' },
+						messageAssistantBg: { label: 'Фон сообщения ассистента', description: '{{variable}}. Карточка сообщений ассистента.' },
+						messageUserBg: { label: 'Фон сообщения пользователя', description: '{{variable}}. Карточка сообщений пользователя.' },
+						messageUserBorder: { label: 'Граница сообщения пользователя', description: '{{variable}}. Рамка сообщений пользователя.' },
+						messageAssistantName: { label: 'Имя ассистента', description: '{{variable}}. Цвет имени/роли ассистента в сообщениях.' },
+						messageUserName: { label: 'Имя пользователя', description: '{{variable}}. Цвет имени/роли пользователя в сообщениях.' },
+						messageTokenColor: { label: 'Цвет токен-бейджа', description: '{{variable}}. Текст иконок/счётчиков токенов.' },
+						chatAvatarPreviewBg: { label: 'Фон превью аватара', description: '{{variable}}. Подложка панели превью аватара.' },
+						sidebarCardBg: { label: 'Фон карточек сайдбаров', description: '{{variable}}. Базовый фон карточек в боковых панелях.' },
+						sidebarCardHoverBorder: { label: 'Граница карточки при hover', description: '{{variable}}. Подсветка карточек в боковых панелях при наведении.' },
+						markdownCodeBg: { label: 'Фон inline-кода', description: '{{variable}}. Подложка для кода в markdown.' },
+						markdownQuoteColor: { label: 'Цвет цитат', description: '{{variable}}. Акцентная линия и цвет цитат в markdown.' },
+						markdownLinkDecorationColor: { label: 'Подчёркивание ссылок', description: '{{variable}}. Цвет декорации ссылок в markdown.' },
+						scrollbarThumb: { label: 'Ползунок скроллбара', description: '{{variable}}. Цвет бегунка скроллбара.' },
+						inputBg: { label: 'Фон инпутов', description: '{{variable}}. Заливка полей ввода.' },
+						nodeGroupBorder: { label: 'Граница группы узлов', description: '{{variable}}. Обычная рамка групп в редакторе операций.' },
+						nodeGroupBorderActive: { label: 'Активная граница группы узлов', description: '{{variable}}. Подсветка активной группы в редакторе операций.' },
+						nodeGroupShadowActive: { label: 'Тень активной группы узлов', description: '{{variable}}. Тень при активном выделении группы.' },
+						nodeGroupBadgeShadow: { label: 'Тень бейджа группы', description: '{{variable}}. Тень подписи/бейджа группы узлов.' },
+						nodeGroupEditorBorder: { label: 'Граница редактора группы', description: '{{variable}}. Рамка редактора свойств группы.' },
+						opSurface: { label: 'Поверхность операций', description: '{{variable}}. Базовый фон UI профилей и операций.' },
+						opSurfaceMuted: { label: 'Приглушённая поверхность операций', description: '{{variable}}. Вторичный фон внутри UI операций.' },
+						opBorder: { label: 'Граница операций', description: '{{variable}}. Базовые рамки в редакторе операций.' },
+						opBorderStrong: { label: 'Сильная граница операций', description: '{{variable}}. Усиленная рамка для важных блоков.' },
+						opMuted: { label: 'Приглушённый текст операций', description: '{{variable}}. Вторичный текст в UI операций.' },
+						opAccent: { label: 'Акцент операций', description: '{{variable}}. Основной акцентный цвет редактора операций.' },
+						opAccentSoft: { label: 'Мягкий акцент операций', description: '{{variable}}. Фоновые акценты и выделения в редакторе операций.' },
+						opSuccess: { label: 'Успех операций', description: '{{variable}}. Цвет успешных состояний.' },
+						opWarn: { label: 'Предупреждение операций', description: '{{variable}}. Цвет warning-состояний.' },
+						opDanger: { label: 'Опасность операций', description: '{{variable}}. Цвет ошибок и destructive-действий.' },
+						opShadow: { label: 'Тень операций', description: '{{variable}}. Базовая тень карточек и блоков операций.' },
+						opBgGradientStart: { label: 'Градиент операций: старт', description: '{{variable}}. Начальный цвет фонового градиента UI операций.' },
+						opBgGradientEnd: { label: 'Градиент операций: конец', description: '{{variable}}. Конечный цвет фонового градиента UI операций.' },
+						opListRowBg: { label: 'Фон строк списка операций', description: '{{variable}}. Подложка строк в списках редактора операций.' },
+						opNodeSurface: { label: 'Поверхность узла', description: '{{variable}}. Фон карточек узлов в графе.' },
+						opNodeBorder: { label: 'Граница узла', description: '{{variable}}. Рамка карточек узлов в графе.' },
+						opNodeShadow: { label: 'Тень узла', description: '{{variable}}. Тень карточек узлов в графе.' },
+						opNodeToolbarBg: { label: 'Фон тулбара узла', description: '{{variable}}. Подложка верхней панели узла.' },
+					},
+					typography: {
+						uiFontFamily: { label: 'Шрифт интерфейса', description: 'Семейство шрифтов для кнопок, меню, панелей и остальных UI-элементов.' },
+						chatFontFamily: { label: 'Шрифт чата', description: 'Семейство шрифтов для содержимого сообщений и текстовых блоков чата.' },
+						uiBaseFontSize: { label: 'Базовый размер UI', description: 'Базовый размер шрифта интерфейса.' },
+						chatBaseFontSize: { label: 'Базовый размер чата', description: 'Базовый размер текста сообщений и контента чата.' },
+						radiusXs: { label: 'Скругление XS', description: 'Самый маленький радиус скругления для компактных элементов.' },
+						radiusSm: { label: 'Скругление SM', description: 'Малый радиус скругления для кнопок и небольших карточек.' },
+						radiusMd: { label: 'Скругление MD', description: 'Средний радиус скругления для стандартных панелей и контролов.' },
+						radiusLg: { label: 'Скругление LG', description: 'Крупный радиус скругления для заметных контейнеров.' },
+						radiusXl: { label: 'Скругление XL', description: 'Максимальный радиус скругления для крупных блоков и выделенных поверхностей.' },
+					},
+					markdown: {
+						fontSize: { label: 'Размер markdown', description: 'Размер текста markdown-контента.' },
+						lineHeight: { label: 'Межстрочный интервал markdown', description: 'Плотность строк в markdown-контенте.' },
+						codeFontSize: { label: 'Размер шрифта кода', description: 'Размер шрифта для inline-кода и кодовых фрагментов.' },
+						codePadding: { label: 'Отступы кода', description: 'Внутренние отступы у inline-кода и кодовых вставок.' },
+						quoteBorderWidth: { label: 'Толщина границы цитаты', description: 'Толщина акцентной линии у markdown-цитат.' },
+					},
+					customCss: {
+						label: 'Пользовательский CSS',
+						description: 'Дополнительные правила CSS, которые будут применяться внутри оболочки приложения.',
+					},
+				},
 				actions: {
 					createNew: 'Создать новый',
 					createCopy: 'Создать копию',

From 3441325b8d95f19f9540319d3b71d08256c37865 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Wed, 18 Mar 2026 23:36:27 +0300
Subject: [PATCH 26/54] fix: delete legacy

---
 server/eslint.config.mjs                      |   2 +-
 server/src/legacy/README.md                   |   7 -
 server/src/legacy/api/agent-cards.api.ts      |  12 --
 server/src/legacy/api/templates.api.ts        | 170 ------------------
 server/src/legacy/routes/chat-routes.ts       |  71 --------
 .../legacy/services/agent-cards.service.ts    |  85 ---------
 .../src/legacy/services/templates.service.ts  |  31 ----
 server/tsconfig.json                          |   4 +-
 8 files changed, 3 insertions(+), 379 deletions(-)
 delete mode 100644 server/src/legacy/README.md
 delete mode 100644 server/src/legacy/api/agent-cards.api.ts
 delete mode 100644 server/src/legacy/api/templates.api.ts
 delete mode 100644 server/src/legacy/routes/chat-routes.ts
 delete mode 100644 server/src/legacy/services/agent-cards.service.ts
 delete mode 100644 server/src/legacy/services/templates.service.ts

diff --git a/server/eslint.config.mjs b/server/eslint.config.mjs
index 917cbe7b..eaedd4a1 100644
--- a/server/eslint.config.mjs
+++ b/server/eslint.config.mjs
@@ -4,7 +4,7 @@ import importPlugin from "eslint-plugin-import";
 import tseslint from "typescript-eslint";
 
 export default tseslint.config(
-  { ignores: ["dist", "data", "public", "src/legacy/**"] },
+  { ignores: ["dist", "data", "public"] },
   js.configs.recommended,
   ...tseslint.configs.recommended,
   {
diff --git a/server/src/legacy/README.md b/server/src/legacy/README.md
deleted file mode 100644
index d9535a5c..00000000
--- a/server/src/legacy/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Legacy archive
-
-This folder contains archived (legacy) server code kept for reference.
-
-- Not used by the current app runtime
-- Excluded from TypeScript build (`server/tsconfig.json`)
-
diff --git a/server/src/legacy/api/agent-cards.api.ts b/server/src/legacy/api/agent-cards.api.ts
deleted file mode 100644
index 21841dcb..00000000
--- a/server/src/legacy/api/agent-cards.api.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { GeneralController } from "@core/factories/controller-factory";
-import { RouteFactory } from "@core/factories/route-factory";
-import { chatService } from "@services/agent-cards.service";
-
-const chatController = new GeneralController(
-  chatService.service,
-  chatService.settings
-);
-
-const chatRoutes = new RouteFactory({ general: chatController }, "agent-cards");
-
-export default chatRoutes.getRouter();
diff --git a/server/src/legacy/api/templates.api.ts b/server/src/legacy/api/templates.api.ts
deleted file mode 100644
index 893d21c9..00000000
--- a/server/src/legacy/api/templates.api.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import express, { type Request } from "express";
-import { z } from "zod";
-
-import { asyncHandler } from "@core/middleware/async-handler";
-import { HttpError } from "@core/middleware/error-handler";
-import { validate } from "@core/middleware/validate";
-import { templatesService } from "@services/templates.service";
-import {
-  type TemplateSettingsType,
-  type TemplateType,
-} from "@shared/types/templates";
-import {
-  createPromptTemplate,
-  deletePromptTemplate,
-  getPromptTemplateById,
-  listPromptTemplates,
-  updatePromptTemplate,
-} from "../../services/chat-core/prompt-templates-repository";
-
-const router = express.Router();
-
-function toTemplateType(dto: {
-  id: string;
-  name: string;
-  templateText: string;
-  createdAt: Date;
-  updatedAt: Date;
-}): TemplateType {
-  return {
-    id: dto.id,
-    name: dto.name,
-    template: dto.templateText,
-    createdAt: dto.createdAt.toISOString(),
-    updatedAt: dto.updatedAt.toISOString(),
-  };
-}
-
-router.get(
-  "/settings/templates",
-  asyncHandler(async () => {
-    const settings = await templatesService.templatesSettings.getConfig();
-    return { data: settings };
-  })
-);
-
-router.post(
-  "/settings/templates",
-  validate({
-    body: z.object({
-      selectedId: z.string().nullable(),
-      enabled: z.boolean(),
-    }) satisfies z.ZodType<TemplateSettingsType>,
-  }),
-  asyncHandler(async (req: Request) => {
-    const saved = await templatesService.templatesSettings.saveConfig(
-      req.body as TemplateSettingsType
-    );
-    return { data: saved };
-  })
-);
-
-router.get(
-  "/templates",
-  asyncHandler(async () => {
-    const items = await listPromptTemplates({
-      ownerId: "global",
-    });
-    return { data: items.map(toTemplateType) };
-  })
-);
-
-router.get(
-  "/templates/:id",
-  asyncHandler(async (req: Request) => {
-    const id = String((req.params as unknown as { id: string }).id);
-    const item = await getPromptTemplateById(id);
-    if (!item) throw new HttpError(404, "Template не найден", "NOT_FOUND");
-    return { data: toTemplateType(item) };
-  })
-);
-
-router.post(
-  "/templates",
-  validate({
-    body: z.object({
-      id: z.string().min(1),
-      name: z.string().min(1),
-      template: z.string(),
-      createdAt: z.string().min(1),
-      updatedAt: z.string().min(1),
-    }) satisfies z.ZodType<TemplateType>,
-  }),
-  asyncHandler(async (req: Request) => {
-    const body = req.body as TemplateType;
-
-    const created = await createPromptTemplate({
-      id: body.id,
-      ownerId: "global",
-      name: body.name,
-      templateText: body.template ?? "",
-      meta: { legacy: true },
-    });
-
-    const settings = await templatesService.templatesSettings.getConfig();
-    await templatesService.templatesSettings.saveConfig({
-      ...settings,
-      selectedId: created.id,
-    });
-    return { data: toTemplateType(created) };
-  })
-);
-
-router.put(
-  "/templates/:id",
-  validate({
-    body: z.object({
-      id: z.string().min(1),
-      name: z.string().min(1),
-      template: z.string(),
-      createdAt: z.string().min(1),
-      updatedAt: z.string().min(1),
-    }) satisfies z.ZodType<TemplateType>,
-  }),
-  asyncHandler(async (req: Request) => {
-    const params = req.params as unknown as { id: string };
-    const body = req.body as TemplateType;
-    if (params.id !== body.id) {
-      throw new HttpError(
-        400,
-        "id в path/body должен совпадать",
-        "VALIDATION_ERROR"
-      );
-    }
-
-    const updated = await updatePromptTemplate({
-      id: body.id,
-      name: body.name,
-      templateText: body.template ?? "",
-    });
-    if (!updated) throw new HttpError(404, "Template не найден", "NOT_FOUND");
-    return { data: toTemplateType(updated) };
-  })
-);
-
-router.delete(
-  "/templates/:id",
-  asyncHandler(async (req: Request) => {
-    const id = String((req.params as unknown as { id: string }).id);
-    const exists = await getPromptTemplateById(id);
-    if (!exists) throw new HttpError(404, "Template не найден", "NOT_FOUND");
-
-    await deletePromptTemplate(id);
-
-    const settings = await templatesService.templatesSettings.getConfig();
-    if (settings.selectedId === id) {
-      const remaining = await listPromptTemplates({
-        ownerId: "global",
-      });
-      const nextSelected = remaining[0]?.id ?? null;
-      await templatesService.templatesSettings.saveConfig({
-        ...settings,
-        selectedId: nextSelected,
-      });
-    }
-
-    return { data: { id } };
-  })
-);
-
-export default router;
diff --git a/server/src/legacy/routes/chat-routes.ts b/server/src/legacy/routes/chat-routes.ts
deleted file mode 100644
index cdf95978..00000000
--- a/server/src/legacy/routes/chat-routes.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import express, { type Request } from "express";
-import { z } from "zod";
-
-import { asyncHandler } from "@core/middleware/async-handler";
-import { validate } from "@core/middleware/validate";
-
-import { chatService } from "../../services/agent-cards.service";
-import { type Chat } from "../../types";
-
-const router = express.Router();
-
-const chatIdParamsSchema = z.object({
-  chatId: z.string().min(1),
-});
-
-router.get(
-  "/chats",
-  asyncHandler(async () => {
-    const chats = await chatService.service.getChatList();
-    return { data: chats };
-  })
-);
-
-router.get(
-  "/chats/:chatId",
-  validate({ params: chatIdParamsSchema }),
-  asyncHandler(async (req: Request) => {
-    const chatId = req.params.chatId as unknown as string;
-    const chat = await chatService.service.getChat(chatId);
-    return { data: chat };
-  })
-);
-
-router.post(
-  "/chats",
-  asyncHandler(async (req: Request) => {
-    const newChat = await chatService.service.createChat(req.body as Chat);
-    return { data: newChat };
-  })
-);
-
-router.post(
-  "/chats/:chatId/duplicate",
-  validate({ params: chatIdParamsSchema }),
-  asyncHandler(async (req: Request) => {
-    const chatId = req.params.chatId as unknown as string;
-    const duplicatedChat = await chatService.service.duplicateChat(chatId);
-    return { data: duplicatedChat };
-  })
-);
-
-router.put(
-  "/chats/:chatId",
-  validate({ params: chatIdParamsSchema }),
-  asyncHandler(async (req: Request) => {
-    const updatedChat = await chatService.service.updateChat(req.body as Chat);
-    return { data: updatedChat };
-  })
-);
-
-router.delete(
-  "/chats/:chatId",
-  validate({ params: chatIdParamsSchema }),
-  asyncHandler(async (req: Request) => {
-    const chatId = req.params.chatId as unknown as string;
-    const deletedChat = await chatService.service.deleteChat(chatId);
-    return { data: deletedChat };
-  })
-);
-
-export default router;
diff --git a/server/src/legacy/services/agent-cards.service.ts b/server/src/legacy/services/agent-cards.service.ts
deleted file mode 100644
index c808c2f9..00000000
--- a/server/src/legacy/services/agent-cards.service.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { type AgentCardSettingsType } from "@shared/types/agent-card";
-
-import { BaseService } from "@core/services/base-service";
-import { ConfigService } from "@core/services/config-service";
-
-import { type Chat } from "../../types";
-
-class ChatService extends BaseService<Chat> {
-  constructor() {
-    super("agent-cards", { logger: console });
-  }
-
-  async getChatList(): Promise<Chat[]> {
-    return await this.getAll();
-  }
-
-  async getChat(chatId: string): Promise<Chat> {
-    return await this.getById(chatId);
-  }
-
-  async createChat(chat: Chat): Promise<Chat> {
-    const now = new Date().toISOString();
-
-    const newChat: Chat = {
-      ...chat,
-      id: chat.id || this.createUUID(),
-      createdAt: chat.createdAt || now,
-      updatedAt: now,
-    };
-
-    return await this.create(newChat);
-  }
-
-  async updateChat(chat: Chat): Promise<Chat> {
-    if (!chat.id) {
-      throw new Error("chat.id обязателен");
-    }
-
-    const now = new Date().toISOString();
-
-    const updatedChat: Chat = {
-      ...chat,
-      updatedAt: now,
-      createdAt: chat.createdAt || now,
-    };
-
-    return await this.update(updatedChat);
-  }
-
-  async deleteChat(chatId: string): Promise<string> {
-    return await this.delete(chatId);
-  }
-
-  async duplicateChat(chatId: string): Promise<Chat> {
-    const original = await this.getById(chatId);
-    const now = new Date().toISOString();
-
-    const duplicated: Chat = {
-      ...original,
-      id: this.createUUID(),
-      createdAt: now,
-      updatedAt: now,
-    };
-
-    return await this.create(duplicated);
-  }
-}
-
-class ChatSettings extends ConfigService<AgentCardSettingsType> {
-  constructor() {
-    super("agent-cards.json", { logger: console });
-  }
-
-  getDefaultConfig(): AgentCardSettingsType {
-    return {
-      selectedId: null,
-      enabled: true,
-    };
-  }
-}
-
-export const chatService = {
-  service: new ChatService(),
-  settings: new ChatSettings(),
-};
diff --git a/server/src/legacy/services/templates.service.ts b/server/src/legacy/services/templates.service.ts
deleted file mode 100644
index cd9d6ef6..00000000
--- a/server/src/legacy/services/templates.service.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import {
-  type TemplateSettingsType,
-  type TemplateType,
-} from "@shared/types/templates";
-
-import { BaseService } from "@core/services/base-service";
-import { ConfigService } from "@core/services/config-service";
-
-class Templates extends BaseService<TemplateType> {
-  constructor() {
-    super("templates");
-  }
-}
-
-class TemplatesSettings extends ConfigService<TemplateSettingsType> {
-  constructor() {
-    super("templates-settings.json", { logger: console });
-  }
-
-  protected getDefaultConfig(): TemplateSettingsType {
-    return {
-      selectedId: null,
-      enabled: true,
-    };
-  }
-}
-
-export const templatesService = {
-  templates: new Templates(),
-  templatesSettings: new TemplatesSettings(),
-};
diff --git a/server/tsconfig.json b/server/tsconfig.json
index aeca149a..e01df50c 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -22,5 +22,5 @@
     "typeRoots": ["./node_modules/@types", "../node_modules/@types", "./types"]
   },
   "include": ["src/**/*.ts", "../shared/**/*.ts"],
-  "exclude": ["node_modules", "dist", "../dist", "src/legacy"]
-} 
\ No newline at end of file
+  "exclude": ["node_modules", "dist", "../dist"]
+} 

From cc1958411c97aa2500d289424831b9cbff44bbd3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Thu, 19 Mar 2026 01:02:08 +0300
Subject: [PATCH 27/54] refactor: remove legacy operation kind from profile
 editor

---
 .../operation-block-validator.test.ts         | 25 +++++++++++++++++++
 .../operations/operation-block-validator.ts   |  1 -
 shared/types/operation-profiles.ts            |  3 +--
 .../node-editor/flow/operation-flow-node.tsx  |  2 --
 .../kind-params/legacy-kind-section.tsx       | 25 -------------------
 .../sections/params-section.tsx               |  3 ---
 .../utils/operation-kind.test.ts              | 13 ++++++++++
 .../utils/operation-kind.ts                   |  4 +--
 .../i18n/resources/en/operationProfiles.ts    |  4 ---
 .../i18n/resources/ru/operationProfiles.ts    |  4 ---
 10 files changed, 40 insertions(+), 44 deletions(-)
 delete mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/legacy-kind-section.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/utils/operation-kind.test.ts

diff --git a/server/src/services/operations/operation-block-validator.test.ts b/server/src/services/operations/operation-block-validator.test.ts
index a78cf813..3582a909 100644
--- a/server/src/services/operations/operation-block-validator.test.ts
+++ b/server/src/services/operations/operation-block-validator.test.ts
@@ -5,6 +5,31 @@ import { describe, expect, test } from "vitest";
 import { validateOperationBlockUpsertInput } from "./operation-block-validator";
 
 describe("operation block validator", () => {
+  test("rejects legacy operation kind", () => {
+    expect(() =>
+      validateOperationBlockUpsertInput({
+        name: "block",
+        enabled: true,
+        operations: [
+          {
+            opId: "6ff77029-5037-4d21-8ace-c9836f58a14b",
+            name: "legacy-op",
+            kind: "legacy",
+            config: {
+              enabled: true,
+              required: false,
+              hooks: ["before_main_llm"],
+              order: 10,
+              params: {
+                params: {},
+              },
+            },
+          },
+        ],
+      })
+    ).toThrow(/Validation error/);
+  });
+
   test("accepts valid block", () => {
     const out = validateOperationBlockUpsertInput({
       name: "block",
diff --git a/server/src/services/operations/operation-block-validator.ts b/server/src/services/operations/operation-block-validator.ts
index faceff99..f2888f86 100644
--- a/server/src/services/operations/operation-block-validator.ts
+++ b/server/src/services/operations/operation-block-validator.ts
@@ -273,7 +273,6 @@ export const operationInProfileSchema: z.ZodType<OperationInProfile> = z
         "tool",
         "compute",
         "transform",
-        "legacy",
       ] satisfies Exclude<OperationKind, "template" | "llm" | "guard">[]),
       config: operationConfigOtherSchema,
     }),
diff --git a/shared/types/operation-profiles.ts b/shared/types/operation-profiles.ts
index 4c02601d..c3c39428 100644
--- a/shared/types/operation-profiles.ts
+++ b/shared/types/operation-profiles.ts
@@ -21,8 +21,7 @@ export type OperationKind =
   | "rag"
   | "tool"
   | "compute"
-  | "transform"
-  | "legacy";
+  | "transform";
 
 export type PromptTimeMessageRole = "system" | "user" | "assistant";
 
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx
index 91f76bd6..9b913476 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/flow/operation-flow-node.tsx
@@ -36,8 +36,6 @@ function getKindColor(kind: string): string {
 			return 'cyan';
 		case 'transform':
 			return 'indigo';
-		case 'legacy':
-			return 'gray';
 		default:
 			return 'blue';
 	}
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/legacy-kind-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/legacy-kind-section.tsx
deleted file mode 100644
index 569c82de..00000000
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/legacy-kind-section.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { JsonKindParamsSection } from './json-kind-params-section';
-
-type Props = {
-	index: number;
-};
-
-const LEGACY_PLACEHOLDER = `{
-  "adapter": "legacy_v1",
-  "payload": {}
-}`;
-
-export const LegacyKindSection: React.FC<Props> = ({ index }) => {
-	const { t } = useTranslation();
-	return (
-		<JsonKindParamsSection
-			index={index}
-			kindLabel={t('operationProfiles.kind.legacy')}
-			description={t('operationProfiles.kindSection.legacy.description')}
-			placeholder={LEGACY_PLACEHOLDER}
-		/>
-	);
-};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx
index 6083aaa4..6d018b46 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 
 import { ComputeKindSection } from './kind-params/compute-kind-section';
 import { GuardKindSection } from './kind-params/guard-kind-section';
-import { LegacyKindSection } from './kind-params/legacy-kind-section';
 import { LlmKindSection } from './kind-params/llm-kind-section';
 import { RagKindSection } from './kind-params/rag-kind-section';
 import { TemplateKindSection } from './kind-params/template-kind-section';
@@ -32,8 +31,6 @@ export const ParamsSection: React.FC<Props> = ({ index, kind }) => {
 			return <ComputeKindSection index={index} />;
 		case 'transform':
 			return <TransformKindSection index={index} />;
-		case 'legacy':
-			return <LegacyKindSection index={index} />;
 		default:
 			return null;
 	}
diff --git a/web/src/features/sidebars/operation-profiles/utils/operation-kind.test.ts b/web/src/features/sidebars/operation-profiles/utils/operation-kind.test.ts
new file mode 100644
index 00000000..490bbfb8
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/utils/operation-kind.test.ts
@@ -0,0 +1,13 @@
+import { describe, expect, it } from 'vitest';
+
+import { OPERATION_KIND_OPTIONS, isOperationKind } from './operation-kind';
+
+describe('operation-kind', () => {
+	it('does not expose legacy in kind options', () => {
+		expect(OPERATION_KIND_OPTIONS).not.toContain('legacy');
+	});
+
+	it('does not accept legacy as an operation kind', () => {
+		expect(isOperationKind('legacy')).toBe(false);
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts b/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts
index 3e8b67d7..52439b25 100644
--- a/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts
+++ b/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts
@@ -8,7 +8,6 @@ export const OPERATION_KIND_OPTIONS = [
 	'tool',
 	'compute',
 	'transform',
-	'legacy',
 ] as const satisfies OperationKind[];
 
 export function isOperationKind(value: unknown): value is OperationKind {
@@ -19,7 +18,6 @@ export function isOperationKind(value: unknown): value is OperationKind {
 		value === 'rag' ||
 		value === 'tool' ||
 		value === 'compute' ||
-		value === 'transform' ||
-		value === 'legacy'
+		value === 'transform'
 	);
 }
diff --git a/web/src/i18n/resources/en/operationProfiles.ts b/web/src/i18n/resources/en/operationProfiles.ts
index b38117fa..4bee4859 100644
--- a/web/src/i18n/resources/en/operationProfiles.ts
+++ b/web/src/i18n/resources/en/operationProfiles.ts
@@ -219,7 +219,6 @@ const enOperationProfiles = {
 				tool: 'Tool',
 				compute: 'Compute',
 				transform: 'Transform',
-				legacy: 'Legacy',
 			},
 			kindSection: {
 				jsonParamsLabel: '{{kindLabel}} params (JSON)',
@@ -234,9 +233,6 @@ const enOperationProfiles = {
 				compute: {
 					description: 'Configure deterministic computations or transformations over structured inputs.',
 				},
-				legacy: {
-					description: 'Use this section for compatibility payload required by legacy executors.',
-				},
 				llm: {
 					description: 'Configure direct model call parameters for this operation.',
 					blocks: {
diff --git a/web/src/i18n/resources/ru/operationProfiles.ts b/web/src/i18n/resources/ru/operationProfiles.ts
index 57c76bc3..ea3fbc56 100644
--- a/web/src/i18n/resources/ru/operationProfiles.ts
+++ b/web/src/i18n/resources/ru/operationProfiles.ts
@@ -220,7 +220,6 @@ const ruOperationProfiles = {
 				tool: 'Инструмент',
 				compute: 'Вычисление',
 				transform: 'Преобразование',
-				legacy: 'Legacy',
 			},
 			kindSection: {
 				jsonParamsLabel: '{{kindLabel}} params (JSON)',
@@ -235,9 +234,6 @@ const ruOperationProfiles = {
 				compute: {
 					description: 'Настройте детерминированные вычисления или преобразования над структурированными входами.',
 				},
-				legacy: {
-					description: 'Используйте секцию для compatibility-payload, необходимых legacy-исполнителям.',
-				},
 				llm: {
 					description: 'Настройте параметры прямого вызова модели для этой операции.',
 					blocks: {

From bd48838109e43c8ee4c280f8c1d2db22c5994199 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Fri, 20 Mar 2026 00:27:08 +0300
Subject: [PATCH 28/54] fix: uato select person

---
 .../chat-entry-read-use-cases.test.ts         | 175 +++++++++++++++-
 .../use-cases/get-chat-entries.ts             |  21 +-
 .../chat-entry-parts/entries-repository.ts    |  30 ++-
 web/src/api/chat-entry-parts.ts               |   1 +
 web/src/model/app-init.ts                     |   2 +
 .../auto-select-current-persona.test.ts       | 197 ++++++++++++++++++
 .../chat-core/auto-select-current-persona.ts  | 114 ++++++++++
 7 files changed, 532 insertions(+), 8 deletions(-)
 create mode 100644 web/src/model/chat-core/auto-select-current-persona.test.ts
 create mode 100644 web/src/model/chat-core/auto-select-current-persona.ts

diff --git a/server/src/application/chat-runtime/use-cases/chat-entry-read-use-cases.test.ts b/server/src/application/chat-runtime/use-cases/chat-entry-read-use-cases.test.ts
index ff9cca5b..3a1f4323 100644
--- a/server/src/application/chat-runtime/use-cases/chat-entry-read-use-cases.test.ts
+++ b/server/src/application/chat-runtime/use-cases/chat-entry-read-use-cases.test.ts
@@ -42,7 +42,7 @@ vi.mock("../../../services/chat-core/generations-repository", async () => {
 
 import { applyMigrations } from "../../../db/apply-migrations";
 import { initDb, resetDbForTests } from "../../../db/client";
-import { chatBranches, chats, entityProfiles } from "../../../db/schema";
+import { chatBranches, chatEntries, chats, entityProfiles } from "../../../db/schema";
 import { createTempDataDir, removeTempDataDir } from "../../../e2e/helpers/tmp-dir";
 import { createEntryWithVariant } from "../../../services/chat-entry-parts/entries-repository";
 import { createPart } from "../../../services/chat-entry-parts/parts-repository";
@@ -128,6 +128,7 @@ async function createEntry(params: {
   chatId: string;
   branchId: string;
   role: "user" | "assistant" | "system";
+  meta?: unknown;
 }) {
   return createEntryWithVariant({
     ownerId: "global",
@@ -135,6 +136,7 @@ async function createEntry(params: {
     branchId: params.branchId,
     role: params.role,
     variantKind: params.role === "assistant" ? "generation" : "manual_edit",
+    meta: params.meta,
   });
 }
 
@@ -227,12 +229,183 @@ describe("chat entry read use cases", () => {
       hasMoreOlder: false,
       nextCursor: null,
     });
+    expect(result.lastSelectedPersonaId).toBeNull();
     expect(result.entries).toHaveLength(2);
     expect(result.entries.every((item) => item.promptUsage.estimator === "chars_div4")).toBe(true);
     expect(result.entries.every((item) => item.promptUsage.included)).toBe(true);
     expect(result.entries.every((item) => item.promptUsage.approxTokens > 0)).toBe(true);
   });
 
+  test("getChatEntries returns lastSelectedPersonaId from the latest active user entry", async () => {
+    const fixture = await seedChatFixture();
+    await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "user",
+      meta: {
+        requestId: "req-1",
+        personaSnapshot: {
+          id: "persona-1",
+          name: "Alice",
+        },
+      },
+    });
+    await new Promise((resolve) => setTimeout(resolve, 2));
+
+    await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "assistant",
+      meta: {
+        personaSnapshot: {
+          id: "persona-assistant",
+          name: "Assistant Persona",
+        },
+      },
+    });
+    await new Promise((resolve) => setTimeout(resolve, 2));
+
+    await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "user",
+      meta: {
+        requestId: "req-2",
+        personaSnapshot: {
+          id: "persona-2",
+          name: "Bob",
+        },
+      },
+    });
+
+    const result = await getChatEntries({
+      chatId: fixture.chatId,
+      query: {
+        limit: 50,
+      },
+    });
+
+    expect(result.lastSelectedPersonaId).toBe("persona-2");
+  });
+
+  test("getChatEntries ignores assistant and system persona snapshots for lastSelectedPersonaId", async () => {
+    const fixture = await seedChatFixture();
+    await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "user",
+      meta: {
+        personaSnapshot: {
+          id: "persona-user",
+          name: "User Persona",
+        },
+      },
+    });
+    await new Promise((resolve) => setTimeout(resolve, 2));
+
+    await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "system",
+      meta: {
+        personaSnapshot: {
+          id: "persona-system",
+          name: "System Persona",
+        },
+      },
+    });
+    await new Promise((resolve) => setTimeout(resolve, 2));
+
+    await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "assistant",
+      meta: {
+        personaSnapshot: {
+          id: "persona-assistant",
+          name: "Assistant Persona",
+        },
+      },
+    });
+
+    const result = await getChatEntries({
+      chatId: fixture.chatId,
+      query: {
+        limit: 50,
+      },
+    });
+
+    expect(result.lastSelectedPersonaId).toBe("persona-user");
+  });
+
+  test("getChatEntries ignores soft-deleted user entries when resolving lastSelectedPersonaId", async () => {
+    const fixture = await seedChatFixture();
+    await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "user",
+      meta: {
+        personaSnapshot: {
+          id: "persona-active",
+          name: "Active Persona",
+        },
+      },
+    });
+    await new Promise((resolve) => setTimeout(resolve, 2));
+
+    const deletedEntry = await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "user",
+      meta: {
+        personaSnapshot: {
+          id: "persona-deleted",
+          name: "Deleted Persona",
+        },
+      },
+    });
+
+    const db = await initDb();
+    db.update(chatEntries)
+      .set({
+        softDeleted: true,
+        softDeletedAt: new Date("2026-03-06T12:00:10.000Z"),
+        softDeletedBy: "user",
+      })
+      .where(eq(chatEntries.entryId, deletedEntry.entry.entryId))
+      .run();
+
+    const result = await getChatEntries({
+      chatId: fixture.chatId,
+      query: {
+        limit: 50,
+      },
+    });
+
+    expect(result.lastSelectedPersonaId).toBe("persona-active");
+  });
+
+  test("getChatEntries returns null for lastSelectedPersonaId when user entries have no persona snapshot", async () => {
+    const fixture = await seedChatFixture();
+    await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "user",
+      meta: {
+        requestId: "req-no-persona",
+      },
+    });
+
+    const result = await getChatEntries({
+      chatId: fixture.chatId,
+      query: {
+        limit: 50,
+      },
+    });
+
+    expect(result.lastSelectedPersonaId).toBeNull();
+  });
+
   test("getChatEntries ignores greeting rerender failures", async () => {
     const fixture = await seedChatFixture();
     const entry = await createEntry({
diff --git a/server/src/application/chat-runtime/use-cases/get-chat-entries.ts b/server/src/application/chat-runtime/use-cases/get-chat-entries.ts
index 209723c7..4a04d761 100644
--- a/server/src/application/chat-runtime/use-cases/get-chat-entries.ts
+++ b/server/src/application/chat-runtime/use-cases/get-chat-entries.ts
@@ -4,6 +4,7 @@ import { getChatById } from "../../../services/chat-core/chats-repository";
 import { rerenderGreetingTemplatesIfPreplay } from "../../../services/chat-core/greeting-template-rerender";
 import { getBranchCurrentTurn } from "../../../services/chat-entry-parts/branch-turn-repository";
 import {
+  getLatestSelectedPersonaIdForChatBranch,
   listEntriesWithActiveVariants,
   listEntriesWithActiveVariantsPage,
   type EntriesPageInfo,
@@ -33,6 +34,7 @@ export type GetChatEntriesInput = {
 export type GetChatEntriesResult = {
   branchId: string;
   currentTurn: number;
+  lastSelectedPersonaId: string | null;
   entries: Array<{
     entry: Entry;
     variant: Variant | null;
@@ -72,12 +74,18 @@ export async function getChatEntries(
     cursorEntryId: params.query.cursorEntryId,
   });
 
-  const currentTurn = await getBranchCurrentTurn({ branchId });
-  const promptWindowEntries = await listEntriesWithActiveVariants({
-    chatId: params.chatId,
-    branchId,
-    limit: PROMPT_USAGE_HISTORY_LIMIT,
-  });
+  const [currentTurn, promptWindowEntries, lastSelectedPersonaId] = await Promise.all([
+    getBranchCurrentTurn({ branchId }),
+    listEntriesWithActiveVariants({
+      chatId: params.chatId,
+      branchId,
+      limit: PROMPT_USAGE_HISTORY_LIMIT,
+    }),
+    getLatestSelectedPersonaIdForChatBranch({
+      chatId: params.chatId,
+      branchId,
+    }),
+  ]);
   const promptProjected = getPromptProjectionWithEntryIds({
     entries: promptWindowEntries,
     currentTurn,
@@ -88,6 +96,7 @@ export async function getChatEntries(
   return {
     branchId,
     currentTurn,
+    lastSelectedPersonaId,
     entries: page.entries.map((item) => ({
       ...item,
       promptUsage: buildEntryPromptUsage({
diff --git a/server/src/services/chat-entry-parts/entries-repository.ts b/server/src/services/chat-entry-parts/entries-repository.ts
index 66ca441e..8e6c66f5 100644
--- a/server/src/services/chat-entry-parts/entries-repository.ts
+++ b/server/src/services/chat-entry-parts/entries-repository.ts
@@ -1,6 +1,6 @@
 import { randomUUID as uuidv4 } from "node:crypto";
 
-import { and, desc, eq, inArray, lt, or } from "drizzle-orm";
+import { and, desc, eq, inArray, lt, or, sql } from "drizzle-orm";
 
 import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
 import { type DbExecutor, initDb } from "../../db/client";
@@ -336,6 +336,34 @@ export async function listEntriesWithActiveVariantsPage(params: {
   };
 }
 
+export async function getLatestSelectedPersonaIdForChatBranch(params: {
+  chatId: string;
+  branchId: string;
+}): Promise<string | null> {
+  const db = await initDb();
+  const rows = await db
+    .select({
+      personaId: sql<string | null>`json_extract(${chatEntries.metaJson}, '$.personaSnapshot.id')`,
+    })
+    .from(chatEntries)
+    .where(
+      and(
+        eq(chatEntries.chatId, params.chatId),
+        eq(chatEntries.branchId, params.branchId),
+        eq(chatEntries.role, "user"),
+        eq(chatEntries.softDeleted, false),
+        sql`json_type(${chatEntries.metaJson}, '$.personaSnapshot.id') = 'text'`
+      )
+    )
+    .orderBy(desc(chatEntries.createdAt), desc(chatEntries.entryId))
+    .limit(1);
+
+  const personaId = rows[0]?.personaId;
+  if (typeof personaId !== "string") return null;
+  const trimmedPersonaId = personaId.trim();
+  return trimmedPersonaId.length > 0 ? trimmedPersonaId : null;
+}
+
 export async function softDeleteEntry(params: { entryId: string; by: "user" | "agent" }): Promise<void> {
   const db = await initDb();
   await db
diff --git a/web/src/api/chat-entry-parts.ts b/web/src/api/chat-entry-parts.ts
index cfa22581..9969fde0 100644
--- a/web/src/api/chat-entry-parts.ts
+++ b/web/src/api/chat-entry-parts.ts
@@ -84,6 +84,7 @@ export type EntriesPageInfo = {
 export type ListChatEntriesResponse = {
 	branchId: string;
 	currentTurn: number;
+	lastSelectedPersonaId: string | null;
 	entries: ChatEntryWithVariantDto[];
 	pageInfo: EntriesPageInfo;
 };
diff --git a/web/src/model/app-init.ts b/web/src/model/app-init.ts
index 1de83255..a3979de5 100644
--- a/web/src/model/app-init.ts
+++ b/web/src/model/app-init.ts
@@ -1,5 +1,7 @@
 import { createEffect, createEvent, createStore, sample } from 'effector';
 
+import './chat-core/auto-select-current-persona';
+
 import { loadAppBackgroundCatalogFx } from './app-backgrounds';
 import { fetchAppSettingsFx } from './app-settings';
 import { loadEntityProfilesFx } from './chat-core';
diff --git a/web/src/model/chat-core/auto-select-current-persona.test.ts b/web/src/model/chat-core/auto-select-current-persona.test.ts
new file mode 100644
index 00000000..e360a509
--- /dev/null
+++ b/web/src/model/chat-core/auto-select-current-persona.test.ts
@@ -0,0 +1,197 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+
+import { $appSettings, fetchAppSettingsFx } from "../app-settings";
+import { loadInitialPageFx } from "../chat-entry-parts";
+import { userPersonsModel } from "../user-persons";
+
+import {
+  $chatPersonaAutoSelectCandidate,
+  $personaIdToAutoSelect,
+} from "./auto-select-current-persona";
+
+import {
+  $currentBranchId,
+  $currentChat,
+  setOpenedChat,
+} from "./index";
+
+import type { ChatDto } from "../../api/chat-core";
+import type { UserPersonSettingsType, UserPersonType } from "@shared/types/user-person";
+
+function makeChat(chatId = "chat-1", branchId = "branch-1"): { chat: ChatDto; branchId: string } {
+  return {
+    chat: {
+      id: chatId,
+      ownerId: "global",
+      entityProfileId: "entity-1",
+      title: "Test chat",
+      activeBranchId: branchId,
+      instructionId: null,
+      status: "active",
+      createdAt: "2026-03-19T10:00:00.000Z",
+      updatedAt: "2026-03-19T10:00:00.000Z",
+      lastMessageAt: null,
+      lastMessagePreview: null,
+      version: 1,
+      meta: null,
+    },
+    branchId,
+  };
+}
+
+function makeUserPerson(id: string, name = id): UserPersonType {
+  return {
+    id,
+    name,
+    createdAt: "2026-03-19T10:00:00.000Z",
+    updatedAt: "2026-03-19T10:00:00.000Z",
+    type: "default",
+  };
+}
+
+function makeUserPersonSettings(
+  patch: Partial<UserPersonSettingsType> = {}
+): UserPersonSettingsType {
+  return {
+    selectedId: null,
+    enabled: true,
+    ...patch,
+  };
+}
+
+function makeAppSettings(autoSelectCurrentPersona: boolean) {
+  return {
+    language: "ru" as const,
+    openLastChat: false,
+    autoSelectCurrentPersona,
+    bindChatCompletionPresetToConnection: false,
+  };
+}
+
+type SetupOptions = {
+  autoSelectCurrentPersona: boolean;
+  userPersonSettings?: UserPersonSettingsType;
+  userPersons?: UserPersonType[];
+  lastSelectedPersonaId: string | null;
+};
+
+async function setupScenario(options: SetupOptions): Promise<UserPersonSettingsType[]> {
+  const updates: UserPersonSettingsType[] = [];
+
+  fetchAppSettingsFx.use(async () => makeAppSettings(options.autoSelectCurrentPersona));
+  userPersonsModel.getSettingsFx.use(async () => ({
+    data: options.userPersonSettings ?? makeUserPersonSettings(),
+  }));
+  userPersonsModel.getItemsFx.use(async () => ({
+    data: options.userPersons ?? [makeUserPerson("persona-1"), makeUserPerson("persona-2")],
+  }));
+  userPersonsModel.updateSettingsFx.use(async (params) => {
+    updates.push(params as UserPersonSettingsType);
+  });
+  loadInitialPageFx.use(async () => ({
+    branchId: "branch-1",
+    currentTurn: 0,
+    entries: [],
+    pageInfo: { hasMoreOlder: false, nextCursor: null },
+    lastSelectedPersonaId: options.lastSelectedPersonaId,
+  }));
+
+  await fetchAppSettingsFx();
+  await userPersonsModel.getSettingsFx();
+  await userPersonsModel.getItemsFx();
+  setOpenedChat(makeChat());
+  await loadInitialPageFx({ chatId: "chat-1", branchId: "branch-1" });
+  await Promise.resolve();
+
+  return updates;
+}
+
+beforeEach(async () => {
+  fetchAppSettingsFx.use(async () => makeAppSettings(false));
+  userPersonsModel.getSettingsFx.use(async () => ({
+    data: makeUserPersonSettings({ enabled: false }),
+  }));
+  userPersonsModel.getItemsFx.use(async () => ({ data: [] }));
+  userPersonsModel.updateSettingsFx.use(async () => undefined);
+  loadInitialPageFx.use(async () => ({
+    branchId: "branch-1",
+    currentTurn: 0,
+    entries: [],
+    pageInfo: { hasMoreOlder: false, nextCursor: null },
+    lastSelectedPersonaId: null,
+  }));
+
+  await fetchAppSettingsFx();
+  await userPersonsModel.getSettingsFx();
+  await userPersonsModel.getItemsFx();
+  setOpenedChat(makeChat());
+});
+
+afterEach(() => {
+  vi.restoreAllMocks();
+});
+
+describe("auto-select current persona", () => {
+  test("updates selected persona after chat open when auto-select is enabled", async () => {
+    const updates = await setupScenario({
+      autoSelectCurrentPersona: true,
+      userPersonSettings: makeUserPersonSettings(),
+      userPersons: [makeUserPerson("persona-1"), makeUserPerson("persona-2")],
+      lastSelectedPersonaId: "persona-2",
+    });
+
+    expect($currentChat.getState()?.id).toBe("chat-1");
+    expect($currentBranchId.getState()).toBe("branch-1");
+    expect($appSettings.getState().autoSelectCurrentPersona).toBe(true);
+    expect(userPersonsModel.$settings.getState().selectedId).toBe("persona-2");
+    expect($chatPersonaAutoSelectCandidate.getState()).toEqual({
+      chatId: "chat-1",
+      branchId: "branch-1",
+      personaId: "persona-2",
+    });
+    expect($personaIdToAutoSelect.getState()).toBeNull();
+    expect(updates).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          selectedId: "persona-2",
+        }),
+      ])
+    );
+  });
+
+  test("does not update selected persona when auto-select is disabled", async () => {
+    const updates = await setupScenario({
+      autoSelectCurrentPersona: false,
+      userPersonSettings: makeUserPersonSettings(),
+      userPersons: [makeUserPerson("persona-2")],
+      lastSelectedPersonaId: "persona-2",
+    });
+
+    expect(userPersonsModel.$settings.getState().selectedId).toBeNull();
+    expect(updates).toEqual([]);
+  });
+
+  test("does not update selected persona when it is already selected", async () => {
+    const updates = await setupScenario({
+      autoSelectCurrentPersona: true,
+      userPersonSettings: makeUserPersonSettings({ selectedId: "persona-2" }),
+      userPersons: [makeUserPerson("persona-2")],
+      lastSelectedPersonaId: "persona-2",
+    });
+
+    expect(userPersonsModel.$settings.getState().selectedId).toBe("persona-2");
+    expect(updates).toEqual([]);
+  });
+
+  test("does not update selected persona when lastSelectedPersonaId is not available", async () => {
+    const updates = await setupScenario({
+      autoSelectCurrentPersona: true,
+      userPersonSettings: makeUserPersonSettings(),
+      userPersons: [makeUserPerson("persona-1")],
+      lastSelectedPersonaId: "persona-missing",
+    });
+
+    expect(userPersonsModel.$settings.getState().selectedId).toBeNull();
+    expect(updates).toEqual([]);
+  });
+});
diff --git a/web/src/model/chat-core/auto-select-current-persona.ts b/web/src/model/chat-core/auto-select-current-persona.ts
new file mode 100644
index 00000000..3e3dc85e
--- /dev/null
+++ b/web/src/model/chat-core/auto-select-current-persona.ts
@@ -0,0 +1,114 @@
+import { combine, createEvent, createStore, sample } from "effector";
+
+import { $appSettings } from "../app-settings";
+import { loadInitialPageFx } from "../chat-entry-parts";
+import { userPersonsModel } from "../user-persons";
+
+import { $currentBranchId, $currentChat, setOpenedChat } from "./index";
+
+type ChatPersonaAutoSelectCandidate = {
+  chatId: string;
+  branchId: string;
+  personaId: string | null;
+};
+
+type AutoSelectContext = {
+  appSettings: typeof $appSettings.defaultState;
+  userPersonSettings: typeof userPersonsModel.$settings.defaultState;
+  userPersons: typeof userPersonsModel.$items.defaultState;
+  currentChat: typeof $currentChat.defaultState;
+  currentBranchId: typeof $currentBranchId.defaultState;
+};
+
+function canAutoSelectPersona(
+  context: AutoSelectContext,
+  candidate: ChatPersonaAutoSelectCandidate | null
+): candidate is ChatPersonaAutoSelectCandidate & { personaId: string } {
+  if (!candidate || !context.currentChat?.id || !context.currentBranchId) return false;
+  if (candidate.chatId !== context.currentChat.id || candidate.branchId !== context.currentBranchId) {
+    return false;
+  }
+  if (!context.appSettings.autoSelectCurrentPersona) return false;
+  if (!context.userPersonSettings.enabled) return false;
+  if (!candidate.personaId) return false;
+  if (context.userPersonSettings.selectedId === candidate.personaId) return false;
+  return context.userPersons.some((userPerson) => userPerson.id === candidate.personaId);
+}
+
+const chatPersonaAutoSelectCandidateResolved =
+  createEvent<ChatPersonaAutoSelectCandidate>();
+const autoSelectCurrentPersonaApplied = createEvent<string>();
+export const $chatPersonaAutoSelectCandidate =
+  createStore<ChatPersonaAutoSelectCandidate | null>(null)
+    .on(setOpenedChat, (_state, { chat, branchId }) => ({
+      chatId: chat.id,
+      branchId,
+      personaId: null,
+    }))
+    .on(chatPersonaAutoSelectCandidateResolved, (_state, candidate) => candidate);
+
+sample({
+  clock: loadInitialPageFx.done,
+  source: {
+    currentChat: $currentChat,
+    currentBranchId: $currentBranchId,
+  },
+  filter: ({ currentChat, currentBranchId }, { params }) =>
+    currentChat?.id === params.chatId && currentBranchId === params.branchId,
+  fn: (_source, { params, result }) => ({
+    chatId: params.chatId,
+    branchId: params.branchId,
+    personaId: result.lastSelectedPersonaId,
+  }),
+  target: chatPersonaAutoSelectCandidateResolved,
+});
+
+export const $personaIdToAutoSelect = combine(
+  {
+    candidate: $chatPersonaAutoSelectCandidate,
+    appSettings: $appSettings,
+    userPersonSettings: userPersonsModel.$settings,
+    userPersons: userPersonsModel.$items,
+    currentChat: $currentChat,
+    currentBranchId: $currentBranchId,
+  },
+  ({ candidate, ...context }) =>
+    canAutoSelectPersona(context, candidate) ? candidate.personaId : null
+);
+
+userPersonsModel.$settings.on(autoSelectCurrentPersonaApplied, (state, selectedId) => ({
+  ...state,
+  selectedId,
+}));
+
+let autoSelectPersonaScheduled = false;
+
+function scheduleAutoSelectedPersonaIfNeeded(): void {
+  if (autoSelectPersonaScheduled) return;
+  autoSelectPersonaScheduled = true;
+  queueMicrotask(() => {
+    autoSelectPersonaScheduled = false;
+    const personaId = $personaIdToAutoSelect.getState();
+    if (!personaId) return;
+    autoSelectCurrentPersonaApplied(personaId);
+    void userPersonsModel.updateSettingsFx({
+      selectedId: personaId,
+    });
+  });
+}
+
+loadInitialPageFx.done.watch(() => {
+  scheduleAutoSelectedPersonaIfNeeded();
+});
+
+$appSettings.updates.watch(() => {
+  scheduleAutoSelectedPersonaIfNeeded();
+});
+
+userPersonsModel.$settings.updates.watch(() => {
+  scheduleAutoSelectedPersonaIfNeeded();
+});
+
+userPersonsModel.$items.updates.watch(() => {
+  scheduleAutoSelectedPersonaIfNeeded();
+});

From 1c6897b44499518f7f793f25fac0405134e57582 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 21 Mar 2026 00:24:28 +0300
Subject: [PATCH 29/54] fix: up

---
 .../chat-knowledge-store-spec-2026-03-21.md   | 821 ++++++++++++++++++
 package.json                                  |   4 +-
 2 files changed, 823 insertions(+), 2 deletions(-)
 create mode 100644 knowledge-base/chat-knowledge-store-spec-2026-03-21.md

diff --git a/knowledge-base/chat-knowledge-store-spec-2026-03-21.md b/knowledge-base/chat-knowledge-store-spec-2026-03-21.md
new file mode 100644
index 00000000..ec6f0a82
--- /dev/null
+++ b/knowledge-base/chat-knowledge-store-spec-2026-03-21.md
@@ -0,0 +1,821 @@
+# TaleSpinner Chat Knowledge Store Spec (v1 Blueprint)
+
+Этот документ фиксирует новую сущность knowledge store для чата и ветки чата.
+
+Документ описывает:
+- назначение и границы ответственности
+- модель данных v1
+- поиск и retrieval flow
+- механизм доступа к закрытым записям
+- разделение baseline/runtime данных
+- import/export режимы
+- план интеграции с SQLite FTS5 и Chroma
+
+Документ является internal blueprint. Это не user-facing docs и не публичный API-контракт.
+
+## 1. Зачем нужна новая сущность
+
+Текущие близкие механизмы решают другие задачи:
+
+- `world-info` активируется по ключам/регуляркам и может случайно тащить в prompt лишние записи
+- `operation artifacts` являются runtime-результатами операций и всегда начинаются пустыми в новом чате
+- `chat_runtime_state` хранит pipeline/runtime state, а не knowledge corpus
+- Chroma в текущем проекте является vector/RAG слоем, а не source of truth для чатового знания
+
+Новая сущность нужна для сценариев, где:
+
+- данные должны быть доступны не автоматически, а только по explicit retrieval
+- записи могут быть импортированы заранее до начала игры
+- записи могут создаваться и обновляться по ходу игры
+- записи могут быть скрыты до выполнения условий
+- retrieval должен работать не только по тегам, но и по именам, алиасам и тексту
+- одна операция ищет кандидатов, а другая операция отбирает из них только нужное для prompt
+
+Итоговый тезис:
+
+> Knowledge store это chat-scoped/branch-scoped structured knowledge layer with explicit retrieval, а не auto-injected lorebook.
+
+## 2. Основные принципы
+
+### 2.1. Explicit access only
+
+Knowledge store не должен автоматически попадать в prompt.
+
+Правильный flow:
+
+1. операция формирует retrieval request
+2. backend делает search
+3. backend возвращает candidate records
+4. отдельная операция/LLM отбирает нужное
+5. только отобранное попадает в prompt
+
+### 2.2. SQLite is source of truth
+
+Source of truth для knowledge store должен жить в основной SQLite БД.
+
+Причины:
+
+- нужны устойчивые id и целостность
+- нужны chat/branch scope
+- нужны import/export режимы
+- нужны explicit links между записями
+- нужны детерминированные unique constraints
+- нужны baseline/runtime distinctions
+
+### 2.3. Chroma is not the primary store
+
+Chroma не должен быть основным хранилищем knowledge records.
+
+Chroma должен использоваться как вторичный индекс для vector search поверх тех же `recordId`.
+
+Итог:
+
+- одна доменная сущность
+- SQLite как primary store
+- FTS5 как text search v1
+- Chroma как optional vector index v2
+
+### 2.4. Retrieval must be hybrid
+
+LLM не должна зависеть только от тегов.
+
+Поиск должен поддерживать:
+
+- exact match по `key`
+- exact/prefix match по `title`
+- aliases
+- tags
+- full-text search
+- optional filters по type/scope/access
+- ranking
+- `limit`
+- score threshold
+
+### 2.5. Closed records need deterministic gating
+
+LLM не решает самостоятельно, можно ли открыть запись.
+
+LLM может:
+
+- предложить найти запись
+- предложить раскрыть запись
+
+Но backend должен:
+
+- проверить gate policy
+- проверить runtime state
+- только потом открыть доступ или раскрыть запись
+
+### 2.6. Baseline and runtime must stay separable
+
+Knowledge store должен различать:
+
+- исходные записи, существовавшие до начала игры
+- записи, созданные или измененные во время игры
+
+Это обязательно для export modes и для чистого сценарного состояния.
+
+## 3. Термины
+
+- `Knowledge Collection`
+  - Логическая группа записей.
+  - Единица импорта/экспорта.
+  - Примеры: scenario pack, lore pack, faction pack, mystery pack.
+
+- `Knowledge Record`
+  - Одна atomic knowledge entry.
+  - Примеры: персонаж, место, событие, правило, предмет, факт, заметка, clue, state node.
+
+- `Knowledge Link`
+  - Явная связь между двумя knowledge records.
+
+- `Baseline Record`
+  - Запись, созданная до текущей игровой сессии или импортированная как исходный материал.
+
+- `Runtime Record`
+  - Запись, созданная в ходе игры пользователем, системой или LLM.
+
+- `Discoverability`
+  - Можно ли найти запись как candidate.
+
+- `Readability`
+  - Можно ли прочитать содержимое записи.
+
+- `Promptability`
+  - Можно ли использовать запись в prompt materialization.
+
+- `Reveal`
+  - Явная смена runtime state записи, после которой запись считается раскрытой в текущем чате/ветке.
+
+## 4. Scope model
+
+Knowledge store поддерживает два уровня scope:
+
+- `chat`
+  - запись общая для всего чата
+
+- `branch`
+  - запись или runtime state локальны для конкретной ветки
+
+Рекомендуемое правило v1:
+
+- `branchId = null` означает chat-scoped record/state
+- `branchId != null` означает branch-scoped record/state
+
+На чтении активная ветка должна видеть:
+
+1. chat-scoped records
+2. branch-scoped records текущей ветки
+
+Глубокую inheritance chain между ветками в v1 лучше не вводить.
+
+## 5. Что должно храниться в knowledge store
+
+Knowledge store должен уметь хранить:
+
+- сущности
+- факты
+- места
+- фракции
+- предметы
+- правила мира
+- события
+- квестовые узлы
+- скрытые данные
+- runtime-заметки
+- runtime-derived records
+- связи между сущностями
+
+Knowledge store не должен быть заточен только под детективные сценарии.
+
+## 6. Предлагаемая логическая модель данных
+
+### 6.1. `knowledge_collections`
+
+Единица импорта/экспорта и группировки.
+
+Рекомендуемые поля:
+
+- `id`
+- `ownerId`
+- `chatId`
+- `branchId | null`
+- `scope` = `chat | branch`
+- `name`
+- `kind`
+- `description`
+- `status` = `active | archived | deleted`
+- `origin` = `import | author | system_seed | user | llm`
+- `layer` = `baseline | runtime`
+- `metaJson`
+- `createdAt`
+- `updatedAt`
+
+Назначение:
+
+- объединяет записи в пакет
+- дает контролируемую единицу export/import
+- позволяет держать baseline pack отдельно от runtime pack
+
+### 6.2. `knowledge_records`
+
+Каноническая запись knowledge store.
+
+Рекомендуемые поля:
+
+- `id`
+- `ownerId`
+- `chatId`
+- `branchId | null`
+- `collectionId`
+- `recordType`
+- `key`
+- `title`
+- `aliasesJson`
+- `tagsJson`
+- `summary`
+- `contentJson`
+- `searchText`
+- `accessMode`
+- `origin`
+- `layer`
+- `derivedFromRecordId | null`
+- `sourceMessageId | null`
+- `sourceOperationId | null`
+- `status` = `active | archived | deleted`
+- `metaJson`
+- `createdAt`
+- `updatedAt`
+
+Рекомендуемые инварианты:
+
+- `key` должен быть stable identifier внутри `chatId + branchId + collectionId`
+- `(chatId, branchId, collectionId, key)` должен быть unique
+- `searchText` является нормализованным материалом для FTS
+
+Пояснения по полям:
+
+- `recordType`
+  - Примеры: `entity`, `location`, `event`, `rule`, `item`, `fact`, `note`, `state`.
+
+- `contentJson`
+  - Structured payload записи.
+  - Это не произвольный blob без смысла.
+  - Для разных `recordType` допускаются разные shape contracts.
+
+- `searchText`
+  - Flattened search material.
+  - Должен включать только разрешенный для индексации текст.
+  - Для закрытых записей сюда не должен безусловно попадать весь hidden payload.
+
+### 6.3. `knowledge_record_links`
+
+Явные связи между записями.
+
+Рекомендуемые поля:
+
+- `id`
+- `ownerId`
+- `chatId`
+- `branchId | null`
+- `fromRecordId`
+- `relationType`
+- `toRecordId`
+- `metaJson`
+- `createdAt`
+- `updatedAt`
+
+Примеры `relationType`:
+
+- `located_in`
+- `belongs_to`
+- `knows_about`
+- `depends_on`
+- `reveals`
+- `contradicts`
+- `same_as`
+
+### 6.4. `knowledge_record_access_state`
+
+Runtime state доступа и раскрытия записи.
+
+Эту таблицу лучше держать отдельно от `knowledge_records`, чтобы:
+
+- не мутировать baseline content при обычном reveal
+- хранить reveal state как runtime overlay
+- управлять chat/branch-specific состоянием
+
+Рекомендуемые поля:
+
+- `id`
+- `ownerId`
+- `chatId`
+- `branchId | null`
+- `recordId`
+- `discoverState` = `hidden | discoverable | visible`
+- `readState` = `blocked | partial | full`
+- `promptState` = `blocked | allowed`
+- `revealState` = `hidden | revealed`
+- `revealedAt | null`
+- `revealedBy` = `system | user | llm | import | null`
+- `revealReason | null`
+- `flagsJson`
+- `updatedAt`
+
+Рекомендуемый unique constraint:
+
+- `(chatId, branchId, recordId)`
+
+### 6.5. Search index
+
+Для v1 нужен SQLite FTS5 индекс поверх `knowledge_records`.
+
+Технически это должна быть отдельная FTS virtual table, но логически она является search projection, а не новой доменной сущностью.
+
+FTS index должен строиться по:
+
+- `title`
+- `aliases`
+- `tags`
+- `summary`
+- `searchText`
+
+Но только из разрешенного searchable material.
+
+## 7. Access model for closed records
+
+### 7.1. Почему нужен отдельный access model
+
+Нужно различать:
+
+- можно ли найти запись
+- можно ли читать запись
+- можно ли отправить запись в prompt
+
+Это не один флаг.
+
+### 7.2. `accessMode`
+
+Рекомендуемые режимы записи:
+
+- `public`
+  - можно искать, читать и использовать
+
+- `discoverable`
+  - можно найти как candidate, но полное содержимое доступно только после выполнения условий
+
+- `hidden`
+  - запись не участвует в обычном поиске и не показывается модели до unlock/reveal
+
+- `internal`
+  - служебная запись для system/runtime use
+
+### 7.3. Safe searchable surface
+
+Для закрытых записей нужно разделять:
+
+- `searchable metadata`
+- `safe preview`
+- `full content`
+
+Пример:
+
+- `title` доступен
+- `summary` доступен в redacted-safe виде
+- полный `contentJson` закрыт
+
+Это дает возможность:
+
+- найти релевантную запись
+- не слить спойлер в prompt раньше времени
+
+### 7.4. Gate policy
+
+У записи должен быть `gatePolicyJson` в `metaJson` или отдельном поле.
+
+Рекомендуемая логика v1:
+
+- `all`
+- `any`
+- `not`
+
+И предикаты:
+
+- `flag_equals`
+- `record_revealed`
+- `record_state`
+- `counter_gte`
+- `manual_unlock`
+- `branch_only`
+
+Пример:
+
+```json
+{
+  "discover": { "mode": "always" },
+  "read": {
+    "all": [
+      { "type": "flag_equals", "key": "quest.met_historian", "value": true },
+      { "type": "record_revealed", "recordKey": "clue:tablet" }
+    ]
+  },
+  "prompt": {
+    "all": [
+      { "type": "record_revealed", "recordKey": "clue:tablet" }
+    ]
+  }
+}
+```
+
+### 7.5. Reveal is a separate action
+
+Запись не должна открываться автоматически от самого факта поиска.
+
+Поиск и раскрытие должны быть разными действиями:
+
+1. search находит candidate
+2. backend проверяет access
+3. отдельный reveal action может открыть запись
+
+Правильный механизм:
+
+- `knowledge.search` не меняет state
+- `knowledge.reveal` меняет state
+
+### 7.6. Allowed reveal triggers
+
+Рекомендуемые trigger modes v1:
+
+- `manual`
+  - явное действие user/system
+
+- `policy_only`
+  - backend сам может раскрыть запись после deterministic policy check
+
+- `llm_proposed`
+  - LLM предлагает reveal, backend валидирует
+
+- `record_revealed`
+  - reveal по раскрытию другой записи
+
+- `flag`
+  - reveal по runtime progress flag
+
+- `counter`
+  - reveal по накопленному счетчику
+
+### 7.7. Runtime truth
+
+Правда о том, раскрыта запись или нет, должна храниться в `knowledge_record_access_state`, а не вычисляться только на лету.
+
+Это нужно для:
+
+- реплея ветки
+- branch-specific state
+- export modes
+- понятного UI/debug
+
+## 8. Provenance and baseline/runtime separation
+
+### 8.1. Почему origin недостаточно
+
+Одного поля `createdDuringGame` недостаточно.
+
+Нужно различать:
+
+- откуда запись появилась
+- к какому слою относится
+- является ли она производной
+
+### 8.2. Recommended provenance fields
+
+Для `knowledge_records`:
+
+- `origin`
+  - `import | author | system_seed | user | llm`
+
+- `layer`
+  - `baseline | runtime`
+
+- `derivedFromRecordId | null`
+  - если runtime record появился на основе существующей записи
+
+- `sourceMessageId | null`
+  - из какого сообщения появилась запись
+
+- `sourceOperationId | null`
+  - какая операция ее создала
+
+### 8.3. Recommended rules
+
+- baseline records не должны бездумно перезаписываться runtime логикой
+- reveal state baseline records не должен мутировать сам baseline content
+- runtime-created records должны быть явно отличимы от imported/seed records
+
+### 8.4. Mutations
+
+Для v1 рекомендуется:
+
+- baseline content хранить как канонический слой
+- reveal/progress state держать отдельно
+- runtime-добавления хранить как runtime records
+
+Полную copy-on-write overlay систему можно отложить.
+
+## 9. Import/export model
+
+### 9.1. Export unit
+
+Основная единица export/import должна быть `knowledge_collection`.
+
+### 9.2. Required export modes
+
+Knowledge store должен поддерживать минимум такие режимы:
+
+- `baseline_only`
+  - только исходные baseline records и links
+
+- `runtime_only`
+  - только runtime-created records и runtime access state
+
+- `baseline_plus_runtime`
+  - полный snapshot
+
+- `baseline_with_reveals`
+  - baseline records + runtime reveal/access state, но без runtime-created records
+
+### 9.3. Why this matters
+
+Это позволяет:
+
+- экспортировать чистый сценарный пакет без игрового мусора
+- экспортировать только прогресс игры
+- восстанавливать hidden/revealed state отдельно от контента
+
+## 10. Search model
+
+### 10.1. Search types
+
+Search должен быть гибридным:
+
+- exact by `key`
+- exact/prefix by `title`
+- aliases match
+- tags overlap
+- FTS5 full-text match
+- optional relations-aware narrowing
+
+### 10.2. Search request
+
+Операции не должны слать произвольный SQL-подобный DSL.
+
+Рекомендуемый безопасный API:
+
+```json
+{
+  "textQuery": "лес древняя магия проклятие",
+  "keys": ["dark_forest"],
+  "titles": ["Темный лес"],
+  "aliases": ["черный лес"],
+  "tags": ["forest", "curse"],
+  "recordTypes": ["location", "fact"],
+  "collectionIds": ["mystery-pack"],
+  "scope": "active_branch_visible",
+  "includeHiddenCandidates": false,
+  "limit": 10,
+  "minScore": 0.25,
+  "minimumShouldMatch": 2
+}
+```
+
+### 10.3. Search response
+
+Search должен возвращать:
+
+- `recordId`
+- `score`
+- `matchReasons`
+- `visibility`
+- `preview`
+- `record` only when allowed
+
+Примерно так:
+
+```json
+{
+  "hits": [
+    {
+      "recordId": "loc_dark_forest",
+      "score": 0.91,
+      "matchReasons": ["title_exact", "fts"],
+      "visibility": "full",
+      "preview": {
+        "title": "Темный лес",
+        "summary": "Древний лес на северной границе"
+      },
+      "record": {
+        "recordType": "location",
+        "tags": ["forest", "north", "curse"]
+      }
+    }
+  ]
+}
+```
+
+### 10.4. Ranking
+
+V1 ranking может быть эвристическим:
+
+- exact key > exact title > alias > tags > FTS
+- FTS relevance учитывает BM25-like score
+- `minimumShouldMatch` и `minScore` режут слабые совпадения
+
+Точное математическое ранжирование не является ключевой целью v1.
+
+### 10.5. Hidden content indexing rule
+
+Полный hidden content не должен безусловно индексироваться в обычный searchable surface.
+
+Рекомендуемое правило:
+
+- `public` записи индексируются полностью
+- `discoverable` записи индексируются по title/aliases/tags/safe preview
+- `hidden` записи не участвуют в обычном search index
+
+## 11. Retrieval flow inside operations
+
+Правильный пайплайн:
+
+1. `planner` operation/LLM читает текущий turn и возвращает retrieval request
+2. backend выполняет search
+3. backend фильтрует результаты по access policy
+4. `curator` operation/LLM получает candidate set
+5. curator выбирает только реально нужные записи
+6. выбранный knowledge material попадает в prompt
+
+Допустимы дополнительные операции:
+
+- `knowledge.reveal`
+- `knowledge.upsert`
+- `knowledge.link`
+
+Но они не должны смешиваться с `knowledge.search`.
+
+## 12. How Chroma fits later
+
+### 12.1. V1
+
+В v1 Chroma не нужен для основной логики knowledge store.
+
+V1 должен работать на:
+
+- SQLite tables
+- SQLite FTS5
+
+### 12.2. V2
+
+После появления vector retrieval:
+
+- те же `knowledge_records` остаются source of truth
+- в Chroma индексируются documents по тем же `recordId`
+- metadata в Chroma содержит минимум:
+  - `recordId`
+  - `chatId`
+  - `branchId`
+  - `collectionId`
+  - `recordType`
+  - `accessMode`
+  - `layer`
+
+### 12.3. Hybrid retrieval in v2
+
+Будущий hybrid retrieval:
+
+1. exact/tag/FTS hits из SQLite
+2. vector hits из Chroma
+3. merge by `recordId`
+4. rerank
+5. pass to curator
+
+Итог:
+
+- не создается новая доменная сущность
+- добавляется только еще один индексный слой
+
+## 13. Recommended backend API surface
+
+### 13.1. Repository-level operations
+
+Нужны repository/service методы:
+
+- `createKnowledgeCollection`
+- `listKnowledgeCollections`
+- `exportKnowledgeCollection`
+- `importKnowledgeCollection`
+- `upsertKnowledgeRecord`
+- `listKnowledgeRecords`
+- `searchKnowledgeRecords`
+- `createKnowledgeLink`
+- `listKnowledgeLinks`
+- `revealKnowledgeRecord`
+- `setKnowledgeAccessState`
+
+### 13.2. Operation-facing actions
+
+Для operation pipeline рекомендуется explicit actions:
+
+- `knowledge.search`
+- `knowledge.reveal`
+- `knowledge.upsert`
+- `knowledge.link`
+
+`knowledge.search` должен быть read-only.
+
+`knowledge.reveal` должен быть guarded.
+
+## 14. V1 implementation blueprint
+
+### Phase 1. Storage foundation
+
+Сделать новые schema modules:
+
+- `server/src/db/schema/chat-knowledge.ts`
+
+Добавить таблицы:
+
+- `knowledge_collections`
+- `knowledge_records`
+- `knowledge_record_links`
+- `knowledge_record_access_state`
+
+Добавить FTS migration для `knowledge_records`.
+
+### Phase 2. Repository layer
+
+Добавить `server/src/services/chat-knowledge/**`:
+
+- collections repository
+- records repository
+- links repository
+- access-state repository
+- search service
+
+### Phase 3. Search
+
+Сделать search service с:
+
+- exact lookup
+- alias/tag lookup
+- FTS lookup
+- merge + ranking
+- score thresholding
+
+### Phase 4. Operation integration
+
+Добавить operation-facing use cases:
+
+- planner -> retrieval request
+- search -> candidate set
+- curator -> prompt-ready reduction
+- reveal action
+
+### Phase 5. Import/export
+
+Добавить collection import/export contracts.
+
+Минимальные режимы:
+
+- baseline only
+- runtime only
+- full snapshot
+
+### Phase 6. Chroma sync
+
+После стабилизации SQLite knowledge model:
+
+- добавить optional Chroma sync/indexing
+- не менять доменные ids и storage truth
+
+## 15. Non-goals for v1
+
+В v1 не нужно:
+
+- делать universal query DSL
+- делать глубокую branch inheritance chain
+- делать сложную graph query language
+- делать full semantic retrieval mandatory
+- давать LLM прямой доступ к raw hidden payload
+- завязывать truth целиком на Chroma
+
+## 16. Final decisions captured by this spec
+
+1. Knowledge store это отдельная доменная сущность, не `world-info`, не artifacts и не runtime state.
+2. Записи должны быть chat-scoped и branch-scoped.
+3. Source of truth должен быть в SQLite.
+4. Обычный поиск v1 должен быть гибридным и включать FTS5.
+5. Chroma должен использоваться позже как вторичный vector index поверх тех же записей.
+6. Search не должен автоматически раскрывать записи.
+7. Для закрытых записей нужен отдельный access/reveal model.
+8. Baseline и runtime данные должны быть явно разделены.
+9. Import/export должен работать на уровне collections и поддерживать разные режимы snapshot.
+10. В prompt попадает только результат explicit retrieval + curation, а не вся knowledge база.
diff --git a/package.json b/package.json
index 16027676..3a1ae8d1 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "install:docs": "yarn --cwd docs install",
     "install:all": "run-s install:server install:web",
     "dev:server": "yarn --cwd server dev",
-    "dev:web": "yarn --cwd web dev",
+    "dev:web": "yarn --cwd web dev --host ",
     "dev": "run-p dev:server dev:web",
     "build:server": "yarn --cwd server build",
     "build:web": "yarn --cwd web build",
@@ -35,4 +35,4 @@
   "devDependencies": {
     "npm-run-all": "^4.1.5"
   }
-}
+}
\ No newline at end of file

From 54c3ee6753a03c4d837a012cc40b303f9ab574a3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 21 Mar 2026 01:15:03 +0300
Subject: [PATCH 30/54] feat: add chat knowledge store with retrieval and
 reveal ops

---
 server/drizzle/0031_chat_knowledge_store.sql  | 150 +++++
 server/drizzle/meta/_journal.json             |   7 +
 server/src/api/_routes_.ts                    |   2 +
 .../src/api/chat-knowledge.core.api.test.ts   | 217 ++++++
 server/src/api/chat-knowledge.core.api.ts     | 379 +++++++++++
 server/src/db/schema.ts                       |   1 +
 server/src/db/schema/chat-knowledge.ts        | 188 ++++++
 .../operations/execute-operations-phase.ts    |  53 +-
 .../knowledge-operation-executor.ts           | 135 ++++
 .../knowledge-operations.integration.test.ts  | 399 ++++++++++++
 .../orchestration/run-operation-hook-phase.ts |   5 +
 .../chat-knowledge.integration.test.ts        | 616 ++++++++++++++++++
 .../knowledge-access-repository.ts            | 133 ++++
 .../knowledge-collections-repository.ts       | 257 ++++++++
 .../chat-knowledge/knowledge-gate-policy.ts   | 146 +++++
 .../chat-knowledge/knowledge-helpers.ts       | 148 +++++
 .../knowledge-links-repository.ts             |  72 ++
 .../knowledge-records-repository.ts           | 229 +++++++
 .../knowledge-reveal-service.ts               | 123 ++++
 .../knowledge-search-service.ts               | 202 ++++++
 .../knowledge-operation-params.test.ts        |  49 ++
 .../operations/knowledge-operation-params.ts  |  50 ++
 .../operations/operation-block-validator.ts   |  92 ++-
 shared/types/chat-knowledge.ts                | 262 ++++++++
 shared/types/operation-profiles.ts            |  30 +-
 .../form/operation-profile-form-mapping.ts    |   2 +-
 26 files changed, 3940 insertions(+), 7 deletions(-)
 create mode 100644 server/drizzle/0031_chat_knowledge_store.sql
 create mode 100644 server/src/api/chat-knowledge.core.api.test.ts
 create mode 100644 server/src/api/chat-knowledge.core.api.ts
 create mode 100644 server/src/db/schema/chat-knowledge.ts
 create mode 100644 server/src/services/chat-generation-v3/operations/knowledge-operation-executor.ts
 create mode 100644 server/src/services/chat-generation-v3/operations/knowledge-operations.integration.test.ts
 create mode 100644 server/src/services/chat-knowledge/chat-knowledge.integration.test.ts
 create mode 100644 server/src/services/chat-knowledge/knowledge-access-repository.ts
 create mode 100644 server/src/services/chat-knowledge/knowledge-collections-repository.ts
 create mode 100644 server/src/services/chat-knowledge/knowledge-gate-policy.ts
 create mode 100644 server/src/services/chat-knowledge/knowledge-helpers.ts
 create mode 100644 server/src/services/chat-knowledge/knowledge-links-repository.ts
 create mode 100644 server/src/services/chat-knowledge/knowledge-records-repository.ts
 create mode 100644 server/src/services/chat-knowledge/knowledge-reveal-service.ts
 create mode 100644 server/src/services/chat-knowledge/knowledge-search-service.ts
 create mode 100644 server/src/services/operations/knowledge-operation-params.test.ts
 create mode 100644 server/src/services/operations/knowledge-operation-params.ts
 create mode 100644 shared/types/chat-knowledge.ts

diff --git a/server/drizzle/0031_chat_knowledge_store.sql b/server/drizzle/0031_chat_knowledge_store.sql
new file mode 100644
index 00000000..fc143f51
--- /dev/null
+++ b/server/drizzle/0031_chat_knowledge_store.sql
@@ -0,0 +1,150 @@
+CREATE TABLE `knowledge_collections` (
+	`id` text PRIMARY KEY NOT NULL,
+	`owner_id` text DEFAULT 'global' NOT NULL,
+	`chat_id` text NOT NULL,
+	`branch_id` text,
+	`scope` text NOT NULL,
+	`name` text NOT NULL,
+	`kind` text,
+	`description` text,
+	`status` text DEFAULT 'active' NOT NULL,
+	`origin` text DEFAULT 'author' NOT NULL,
+	`layer` text DEFAULT 'baseline' NOT NULL,
+	`meta_json` text,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`chat_id`) REFERENCES `chats`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`branch_id`) REFERENCES `chat_branches`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE INDEX `knowledge_collections_owner_chat_updated_at_idx` ON `knowledge_collections` (`owner_id`,`chat_id`,`updated_at`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `knowledge_collections_owner_chat_branch_name_uq` ON `knowledge_collections` (`owner_id`,`chat_id`,`branch_id`,`name`);
+--> statement-breakpoint
+CREATE TABLE `knowledge_records` (
+	`id` text PRIMARY KEY NOT NULL,
+	`owner_id` text DEFAULT 'global' NOT NULL,
+	`chat_id` text NOT NULL,
+	`branch_id` text,
+	`collection_id` text NOT NULL,
+	`record_type` text NOT NULL,
+	`key` text NOT NULL,
+	`title` text NOT NULL,
+	`aliases_json` text DEFAULT '[]' NOT NULL,
+	`tags_json` text DEFAULT '[]' NOT NULL,
+	`summary` text,
+	`content_json` text DEFAULT 'null' NOT NULL,
+	`search_text` text DEFAULT '' NOT NULL,
+	`access_mode` text DEFAULT 'public' NOT NULL,
+	`origin` text DEFAULT 'author' NOT NULL,
+	`layer` text DEFAULT 'baseline' NOT NULL,
+	`derived_from_record_id` text,
+	`source_message_id` text,
+	`source_operation_id` text,
+	`status` text DEFAULT 'active' NOT NULL,
+	`gate_policy_json` text,
+	`meta_json` text,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`chat_id`) REFERENCES `chats`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`branch_id`) REFERENCES `chat_branches`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`collection_id`) REFERENCES `knowledge_collections`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE INDEX `knowledge_records_owner_chat_branch_updated_at_idx` ON `knowledge_records` (`owner_id`,`chat_id`,`branch_id`,`updated_at`);
+--> statement-breakpoint
+CREATE INDEX `knowledge_records_collection_record_type_idx` ON `knowledge_records` (`collection_id`,`record_type`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `knowledge_records_scope_collection_key_uq` ON `knowledge_records` (`chat_id`,`branch_id`,`collection_id`,`key`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `knowledge_records_active_scope_collection_key_uq` ON `knowledge_records` (`chat_id`,`branch_id`,`collection_id`,`key`) WHERE `status` = 'active';
+--> statement-breakpoint
+CREATE TABLE `knowledge_record_links` (
+	`id` text PRIMARY KEY NOT NULL,
+	`owner_id` text DEFAULT 'global' NOT NULL,
+	`chat_id` text NOT NULL,
+	`branch_id` text,
+	`from_record_id` text NOT NULL,
+	`relation_type` text NOT NULL,
+	`to_record_id` text NOT NULL,
+	`meta_json` text,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`chat_id`) REFERENCES `chats`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`branch_id`) REFERENCES `chat_branches`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`from_record_id`) REFERENCES `knowledge_records`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`to_record_id`) REFERENCES `knowledge_records`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE INDEX `knowledge_record_links_owner_chat_branch_relation_idx` ON `knowledge_record_links` (`owner_id`,`chat_id`,`branch_id`,`relation_type`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `knowledge_record_links_from_relation_to_uq` ON `knowledge_record_links` (`from_record_id`,`relation_type`,`to_record_id`);
+--> statement-breakpoint
+CREATE TABLE `knowledge_record_access_state` (
+	`id` text PRIMARY KEY NOT NULL,
+	`owner_id` text DEFAULT 'global' NOT NULL,
+	`chat_id` text NOT NULL,
+	`branch_id` text,
+	`record_id` text NOT NULL,
+	`discover_state` text DEFAULT 'hidden' NOT NULL,
+	`read_state` text DEFAULT 'blocked' NOT NULL,
+	`prompt_state` text DEFAULT 'blocked' NOT NULL,
+	`reveal_state` text DEFAULT 'hidden' NOT NULL,
+	`revealed_at` integer,
+	`revealed_by` text,
+	`reveal_reason` text,
+	`flags_json` text DEFAULT '{}' NOT NULL,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`chat_id`) REFERENCES `chats`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`branch_id`) REFERENCES `chat_branches`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`record_id`) REFERENCES `knowledge_records`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE INDEX `knowledge_record_access_state_chat_branch_reveal_idx` ON `knowledge_record_access_state` (`chat_id`,`branch_id`,`reveal_state`,`updated_at`);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `knowledge_record_access_state_scope_record_uq` ON `knowledge_record_access_state` (`chat_id`,`branch_id`,`record_id`);
+--> statement-breakpoint
+CREATE VIRTUAL TABLE `knowledge_records_fts` USING fts5(
+	`record_id` UNINDEXED,
+	`title`,
+	`aliases`,
+	`tags`,
+	`summary`,
+	`search_text`
+);
+--> statement-breakpoint
+CREATE TRIGGER `knowledge_records_ai_fts`
+AFTER INSERT ON `knowledge_records`
+WHEN NEW.`status` = 'active' AND NEW.`access_mode` IN ('public', 'discoverable')
+BEGIN
+	INSERT INTO `knowledge_records_fts` (`record_id`, `title`, `aliases`, `tags`, `summary`, `search_text`)
+	VALUES (
+		NEW.`id`,
+		NEW.`title`,
+		COALESCE(NEW.`aliases_json`, '[]'),
+		COALESCE(NEW.`tags_json`, '[]'),
+		COALESCE(NEW.`summary`, ''),
+		COALESCE(NEW.`search_text`, '')
+	);
+END;
+--> statement-breakpoint
+CREATE TRIGGER `knowledge_records_ad_fts`
+AFTER DELETE ON `knowledge_records`
+BEGIN
+	DELETE FROM `knowledge_records_fts` WHERE `record_id` = OLD.`id`;
+END;
+--> statement-breakpoint
+CREATE TRIGGER `knowledge_records_au_fts`
+AFTER UPDATE ON `knowledge_records`
+BEGIN
+	DELETE FROM `knowledge_records_fts` WHERE `record_id` = OLD.`id`;
+	INSERT INTO `knowledge_records_fts` (`record_id`, `title`, `aliases`, `tags`, `summary`, `search_text`)
+	SELECT
+		NEW.`id`,
+		NEW.`title`,
+		COALESCE(NEW.`aliases_json`, '[]'),
+		COALESCE(NEW.`tags_json`, '[]'),
+		COALESCE(NEW.`summary`, ''),
+		COALESCE(NEW.`search_text`, '')
+	WHERE NEW.`status` = 'active' AND NEW.`access_mode` IN ('public', 'discoverable');
+END;
diff --git a/server/drizzle/meta/_journal.json b/server/drizzle/meta/_journal.json
index 3d9f0b10..3cde38e9 100644
--- a/server/drizzle/meta/_journal.json
+++ b/server/drizzle/meta/_journal.json
@@ -190,6 +190,13 @@
       "when": 1773200000000,
       "tag": "0030_app_backgrounds",
       "breakpoints": true
+    },
+    {
+      "idx": 27,
+      "version": "7",
+      "when": 1774060000000,
+      "tag": "0031_chat_knowledge_store",
+      "breakpoints": true
     }
   ]
 }
diff --git a/server/src/api/_routes_.ts b/server/src/api/_routes_.ts
index cd57b20f..6ac243f7 100644
--- a/server/src/api/_routes_.ts
+++ b/server/src/api/_routes_.ts
@@ -2,6 +2,7 @@ import appBackgroundsRoutes from "./app-backgrounds.core.api";
 import appSettingsRoutes from "./app-settings.api";
 import bundlesCoreRoutes from "./bundles.core.api";
 import chatEntriesRoutes from "./chat-entries.api";
+import chatKnowledgeCoreRoutes from "./chat-knowledge.core.api";
 import chatCoreRoutes from "./chats.core.api";
 import entityProfilesCoreRoutes from "./entity-profiles.core.api";
 import entityProfilesImportRoutes from "./entity-profiles.import.api";
@@ -28,6 +29,7 @@ export const routes = [
   entityProfilesCoreRoutes,
   entityProfilesImportRoutes,
   chatCoreRoutes,
+  chatKnowledgeCoreRoutes,
   chatEntriesRoutes,
   generationsCoreRoutes,
   operationProfilesCoreRoutes,
diff --git a/server/src/api/chat-knowledge.core.api.test.ts b/server/src/api/chat-knowledge.core.api.test.ts
new file mode 100644
index 00000000..f37a72c3
--- /dev/null
+++ b/server/src/api/chat-knowledge.core.api.test.ts
@@ -0,0 +1,217 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+import { afterEach, describe, expect, test } from "vitest";
+
+import { bootstrapApp, createApp } from "../app";
+import { initDb, resetDbForTests } from "../db/client";
+import { chatBranches, chats, entityProfiles } from "../db/schema";
+
+import type { Server } from "node:http";
+
+async function startServer() {
+  resetDbForTests();
+  const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "talespinner-knowledge-api-"));
+  const dbPath = path.join(tempDir, "db.sqlite");
+  await bootstrapApp({ dbPath });
+  const app = createApp();
+  const server = await new Promise<Server>((resolve) => {
+    const started = app.listen(0, () => resolve(started));
+  });
+
+  const address = server.address();
+  if (!address || typeof address === "string") {
+    throw new Error("Failed to resolve test server address");
+  }
+
+  return {
+    baseUrl: `http://127.0.0.1:${address.port}`,
+    tempDir,
+    server,
+  };
+}
+
+async function stopServer(server: Server, tempDir: string) {
+  await new Promise<void>((resolve, reject) => {
+    server.close((error) => (error ? reject(error) : resolve()));
+  });
+  resetDbForTests();
+  await fs.rm(tempDir, { recursive: true, force: true });
+}
+
+async function seedChatScope(params: { chatId: string; branchId: string }) {
+  const db = await initDb();
+  const now = new Date();
+  const entityProfileId = `entity:${params.chatId}`;
+
+  await db.insert(entityProfiles).values({
+    id: entityProfileId,
+    ownerId: "global",
+    name: `Entity ${params.chatId}`,
+    kind: "CharSpec",
+    specJson: "{}",
+    metaJson: null,
+    isFavorite: false,
+    createdAt: now,
+    updatedAt: now,
+    avatarAssetId: null,
+  });
+
+  await db.insert(chats).values({
+    id: params.chatId,
+    ownerId: "global",
+    entityProfileId,
+    title: `Chat ${params.chatId}`,
+    activeBranchId: params.branchId,
+    instructionId: null,
+    status: "active",
+    createdAt: now,
+    updatedAt: now,
+    lastMessageAt: null,
+    lastMessagePreview: null,
+    version: 0,
+    metaJson: null,
+    originChatId: null,
+    originBranchId: null,
+    originMessageId: null,
+  });
+
+  await db.insert(chatBranches).values({
+    id: params.branchId,
+    ownerId: "global",
+    chatId: params.chatId,
+    title: params.branchId,
+    createdAt: now,
+    updatedAt: now,
+    parentBranchId: null,
+    forkedFromMessageId: null,
+    forkedFromVariantId: null,
+    metaJson: null,
+    currentTurn: 0,
+  });
+}
+
+describe("chat knowledge api", () => {
+  afterEach(() => {
+    resetDbForTests();
+  });
+
+  test("creates records, searches previews, and reveals through HTTP routes", async () => {
+    const started = await startServer();
+    try {
+      await seedChatScope({ chatId: "chat-api", branchId: "branch-api" });
+
+      const collectionResponse = await fetch(`${started.baseUrl}/api/chat-knowledge/collections`, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+        },
+        body: JSON.stringify({
+          chatId: "chat-api",
+          branchId: null,
+          scope: "chat",
+          name: "API Pack",
+          kind: "scenario",
+          origin: "author",
+          layer: "baseline",
+        }),
+      });
+      expect(collectionResponse.status).toBe(200);
+      const collectionBody = (await collectionResponse.json()) as { data: { id: string } };
+
+      const recordResponse = await fetch(`${started.baseUrl}/api/chat-knowledge/records`, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+        },
+        body: JSON.stringify({
+          chatId: "chat-api",
+          branchId: null,
+          collectionId: collectionBody.data.id,
+          recordType: "fact",
+          key: "sealed_room",
+          title: "Sealed Room",
+          aliases: [],
+          tags: ["secret"],
+          summary: "A hidden room under the manor",
+          content: { text: "The sealed room contains the evidence." },
+          accessMode: "discoverable",
+          origin: "author",
+          layer: "baseline",
+          gatePolicy: {
+            read: {
+              all: [{ type: "manual_unlock" }],
+            },
+          },
+        }),
+      });
+      expect(recordResponse.status).toBe(200);
+      const recordBody = (await recordResponse.json()) as { data: { id: string } };
+
+      const searchBefore = await fetch(`${started.baseUrl}/api/chat-knowledge/records/search`, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+        },
+        body: JSON.stringify({
+          chatId: "chat-api",
+          branchId: "branch-api",
+          request: {
+            textQuery: "sealed room",
+            limit: 5,
+          },
+        }),
+      });
+      expect(searchBefore.status).toBe(200);
+      const searchBeforeBody = (await searchBefore.json()) as {
+        data: { hits: Array<{ visibility: string; record: unknown }> };
+      };
+      expect(searchBeforeBody.data.hits[0]?.visibility).toBe("preview");
+      expect(searchBeforeBody.data.hits[0]?.record).toBeNull();
+
+      const revealResponse = await fetch(`${started.baseUrl}/api/chat-knowledge/reveal`, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+        },
+        body: JSON.stringify({
+          chatId: "chat-api",
+          branchId: "branch-api",
+          request: {
+            recordIds: [recordBody.data.id],
+            revealedBy: "system",
+            reason: "manual unlock",
+            context: {
+              manualUnlock: true,
+            },
+          },
+        }),
+      });
+      expect(revealResponse.status).toBe(200);
+
+      const searchAfter = await fetch(`${started.baseUrl}/api/chat-knowledge/records/search`, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+        },
+        body: JSON.stringify({
+          chatId: "chat-api",
+          branchId: "branch-api",
+          request: {
+            textQuery: "sealed room",
+            limit: 5,
+          },
+        }),
+      });
+      const searchAfterBody = (await searchAfter.json()) as {
+        data: { hits: Array<{ visibility: string; record: { key: string } | null }> };
+      };
+      expect(searchAfter.status).toBe(200);
+      expect(searchAfterBody.data.hits[0]?.visibility).toBe("full");
+      expect(searchAfterBody.data.hits[0]?.record?.key).toBe("sealed_room");
+    } finally {
+      await stopServer(started.server, started.tempDir);
+    }
+  });
+});
diff --git a/server/src/api/chat-knowledge.core.api.ts b/server/src/api/chat-knowledge.core.api.ts
new file mode 100644
index 00000000..5d96347d
--- /dev/null
+++ b/server/src/api/chat-knowledge.core.api.ts
@@ -0,0 +1,379 @@
+import {
+  knowledgeAccessModes,
+  knowledgeExportModes,
+  knowledgeLayers,
+  knowledgeOrigins,
+  knowledgeRecordStatuses,
+  knowledgeScopes,
+  type KnowledgeCollectionExportPayload,
+  type KnowledgeGatePolicy,
+} from "@shared/types/chat-knowledge";
+import express, { type Request } from "express";
+import { z } from "zod";
+
+import { asyncHandler } from "@core/middleware/async-handler";
+import { HttpError } from "@core/middleware/error-handler";
+import { validate } from "@core/middleware/validate";
+
+import { idSchema, ownerIdSchema } from "../chat-core/schemas";
+import { getRequestOwnerId } from "../core/request-context/request-context";
+import {
+  createKnowledgeCollection,
+  exportKnowledgeCollection,
+  getKnowledgeCollectionById,
+  importKnowledgeCollection,
+  listKnowledgeCollections,
+} from "../services/chat-knowledge/knowledge-collections-repository";
+import {
+  createKnowledgeRecordLinksBulk,
+  listKnowledgeRecordLinks,
+} from "../services/chat-knowledge/knowledge-links-repository";
+import {
+  getKnowledgeRecordById,
+  listKnowledgeRecords,
+  upsertKnowledgeRecord,
+} from "../services/chat-knowledge/knowledge-records-repository";
+import { revealKnowledgeRecords } from "../services/chat-knowledge/knowledge-reveal-service";
+import { searchKnowledgeRecords } from "../services/chat-knowledge/knowledge-search-service";
+
+const router = express.Router();
+
+const branchIdSchema = idSchema.nullable().optional();
+const knowledgeScopeSchema = z.enum(knowledgeScopes);
+const knowledgeOriginSchema = z.enum(knowledgeOrigins);
+const knowledgeLayerSchema = z.enum(knowledgeLayers);
+const knowledgeAccessModeSchema = z.enum(knowledgeAccessModes);
+const knowledgeStatusSchema = z.enum(knowledgeRecordStatuses);
+const knowledgeExportModeSchema = z.enum(knowledgeExportModes);
+
+const collectionCreateSchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+  scope: knowledgeScopeSchema,
+  name: z.string().min(1),
+  kind: z.string().min(1).nullable().optional(),
+  description: z.string().nullable().optional(),
+  status: z.enum(["active", "archived", "deleted"]).optional(),
+  origin: knowledgeOriginSchema,
+  layer: knowledgeLayerSchema,
+  meta: z.unknown().optional(),
+});
+
+const collectionListQuerySchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+});
+
+const collectionExportQuerySchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+  mode: knowledgeExportModeSchema,
+});
+
+const collectionImportSchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+  payload: z.unknown(),
+});
+
+const recordUpsertSchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+  collectionId: idSchema,
+  recordType: z.string().min(1),
+  key: z.string().min(1),
+  title: z.string().min(1),
+  aliases: z.array(z.string()).default([]),
+  tags: z.array(z.string()).default([]),
+  summary: z.string().nullable().optional(),
+  content: z.unknown(),
+  accessMode: knowledgeAccessModeSchema,
+  origin: knowledgeOriginSchema,
+  layer: knowledgeLayerSchema,
+  derivedFromRecordId: idSchema.nullable().optional(),
+  sourceMessageId: idSchema.nullable().optional(),
+  sourceOperationId: z.string().nullable().optional(),
+  status: knowledgeStatusSchema.optional(),
+  gatePolicy: z.unknown().nullable().optional(),
+  meta: z.unknown().optional(),
+});
+
+const recordListQuerySchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+  collectionId: idSchema.optional(),
+  includeArchived: z.coerce.boolean().optional(),
+});
+
+const searchSchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+  request: z.object({
+    textQuery: z.string().optional(),
+    keys: z.array(z.string()).optional(),
+    titles: z.array(z.string()).optional(),
+    aliases: z.array(z.string()).optional(),
+    tags: z.array(z.string()).optional(),
+    recordTypes: z.array(z.string()).optional(),
+    collectionIds: z.array(idSchema).optional(),
+    includeHiddenCandidates: z.boolean().optional(),
+    limit: z.number().int().min(1).max(200).optional(),
+    minScore: z.number().finite().optional(),
+    minimumShouldMatch: z.number().int().min(0).optional(),
+    context: z
+      .object({
+        flags: z.record(z.string(), z.unknown()).optional(),
+        counters: z.record(z.string(), z.number()).optional(),
+        manualUnlock: z.boolean().optional(),
+      })
+      .optional(),
+  }),
+});
+
+const linksCreateSchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+  items: z
+    .array(
+      z.object({
+        fromRecordId: idSchema,
+        relationType: z.string().min(1),
+        toRecordId: idSchema,
+        meta: z.unknown().optional(),
+      })
+    )
+    .min(1)
+    .max(500),
+});
+
+const linksListQuerySchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+});
+
+const revealSchema = z.object({
+  ownerId: ownerIdSchema.optional(),
+  chatId: idSchema,
+  branchId: branchIdSchema,
+  request: z.object({
+    recordIds: z.array(idSchema).optional(),
+    recordKeys: z.array(z.string()).optional(),
+    reason: z.string().optional(),
+    revealedBy: z.enum(["system", "user", "llm", "import"]).optional(),
+    context: z
+      .object({
+        flags: z.record(z.string(), z.unknown()).optional(),
+        counters: z.record(z.string(), z.number()).optional(),
+        manualUnlock: z.boolean().optional(),
+      })
+      .optional(),
+  }),
+});
+
+router.get(
+  "/chat-knowledge/collections",
+  validate({ query: collectionListQuerySchema }),
+  asyncHandler(async (req: Request) => {
+    const query = collectionListQuerySchema.parse(req.query);
+    return {
+      data: await listKnowledgeCollections({
+        ...query,
+        branchId: query.branchId ?? null,
+      }),
+    };
+  })
+);
+
+router.post(
+  "/chat-knowledge/collections",
+  validate({ body: collectionCreateSchema }),
+  asyncHandler(async (req: Request) => {
+    const body = collectionCreateSchema.parse(req.body);
+    return {
+      data: await createKnowledgeCollection({
+        ...body,
+        ownerId: getRequestOwnerId(req, body.ownerId),
+        branchId: body.branchId ?? null,
+      }),
+    };
+  })
+);
+
+router.get(
+  "/chat-knowledge/collections/:id",
+  validate({ params: z.object({ id: idSchema }) }),
+  asyncHandler(async (req: Request) => {
+    const collection = await getKnowledgeCollectionById(String(req.params.id));
+    if (!collection) throw new HttpError(404, "Knowledge collection not found", "NOT_FOUND");
+    return { data: collection };
+  })
+);
+
+router.get(
+  "/chat-knowledge/collections/:id/export",
+  validate({
+    params: z.object({ id: idSchema }),
+    query: collectionExportQuerySchema,
+  }),
+  asyncHandler(async (req: Request) => {
+    const query = collectionExportQuerySchema.parse(req.query);
+    return {
+      data: await exportKnowledgeCollection({
+        ownerId: getRequestOwnerId(req, query.ownerId),
+        chatId: query.chatId,
+        branchId: query.branchId ?? null,
+        collectionId: String(req.params.id),
+        mode: query.mode,
+      }),
+    };
+  })
+);
+
+router.post(
+  "/chat-knowledge/collections/import",
+  validate({ body: collectionImportSchema }),
+  asyncHandler(async (req: Request) => {
+    const body = collectionImportSchema.parse(req.body);
+    return {
+      data: await importKnowledgeCollection({
+        ownerId: getRequestOwnerId(req, body.ownerId),
+        chatId: body.chatId,
+        branchId: body.branchId ?? null,
+        payload: body.payload as KnowledgeCollectionExportPayload,
+      }),
+    };
+  })
+);
+
+router.get(
+  "/chat-knowledge/records",
+  validate({ query: recordListQuerySchema }),
+  asyncHandler(async (req: Request) => {
+    const query = recordListQuerySchema.parse(req.query);
+    return {
+      data: await listKnowledgeRecords({
+        ownerId: getRequestOwnerId(req, query.ownerId),
+        chatId: query.chatId,
+        branchId: query.branchId ?? null,
+        collectionId: query.collectionId,
+        includeArchived: query.includeArchived,
+      }),
+    };
+  })
+);
+
+router.post(
+  "/chat-knowledge/records",
+  validate({ body: recordUpsertSchema }),
+  asyncHandler(async (req: Request) => {
+    const body = recordUpsertSchema.parse(req.body);
+    return {
+      data: await upsertKnowledgeRecord({
+        ownerId: getRequestOwnerId(req, body.ownerId),
+        chatId: body.chatId,
+        branchId: body.branchId ?? null,
+        collectionId: body.collectionId,
+        recordType: body.recordType,
+        key: body.key,
+        title: body.title,
+        aliases: body.aliases,
+        tags: body.tags,
+        summary: body.summary,
+        content: body.content,
+        accessMode: body.accessMode,
+        origin: body.origin,
+        layer: body.layer,
+        derivedFromRecordId: body.derivedFromRecordId,
+        sourceMessageId: body.sourceMessageId,
+        sourceOperationId: body.sourceOperationId,
+        status: body.status,
+        gatePolicy: body.gatePolicy as KnowledgeGatePolicy | null | undefined,
+        meta: body.meta,
+      }),
+    };
+  })
+);
+
+router.get(
+  "/chat-knowledge/records/:id",
+  validate({ params: z.object({ id: idSchema }) }),
+  asyncHandler(async (req: Request) => {
+    const record = await getKnowledgeRecordById(String(req.params.id));
+    if (!record) throw new HttpError(404, "Knowledge record not found", "NOT_FOUND");
+    return { data: record };
+  })
+);
+
+router.post(
+  "/chat-knowledge/records/search",
+  validate({ body: searchSchema }),
+  asyncHandler(async (req: Request) => {
+    const body = searchSchema.parse(req.body);
+    return {
+      data: await searchKnowledgeRecords({
+        ownerId: getRequestOwnerId(req, body.ownerId),
+        chatId: body.chatId,
+        branchId: body.branchId ?? null,
+        request: body.request,
+      }),
+    };
+  })
+);
+
+router.get(
+  "/chat-knowledge/links",
+  validate({ query: linksListQuerySchema }),
+  asyncHandler(async (req: Request) => {
+    const query = linksListQuerySchema.parse(req.query);
+    return {
+      data: await listKnowledgeRecordLinks({
+        ownerId: getRequestOwnerId(req, query.ownerId),
+        chatId: query.chatId,
+        branchId: query.branchId ?? null,
+      }),
+    };
+  })
+);
+
+router.post(
+  "/chat-knowledge/links",
+  validate({ body: linksCreateSchema }),
+  asyncHandler(async (req: Request) => {
+    const body = linksCreateSchema.parse(req.body);
+    return {
+      data: await createKnowledgeRecordLinksBulk({
+        ownerId: getRequestOwnerId(req, body.ownerId),
+        chatId: body.chatId,
+        branchId: body.branchId ?? null,
+        items: body.items,
+      }),
+    };
+  })
+);
+
+router.post(
+  "/chat-knowledge/reveal",
+  validate({ body: revealSchema }),
+  asyncHandler(async (req: Request) => {
+    const body = revealSchema.parse(req.body);
+    return {
+      data: await revealKnowledgeRecords({
+        ownerId: getRequestOwnerId(req, body.ownerId),
+        chatId: body.chatId,
+        branchId: body.branchId ?? null,
+        request: body.request,
+      }),
+    };
+  })
+);
+
+export default router;
diff --git a/server/src/db/schema.ts b/server/src/db/schema.ts
index 991ee776..06e4836f 100644
--- a/server/src/db/schema.ts
+++ b/server/src/db/schema.ts
@@ -10,4 +10,5 @@ export * from "./schema/ui";
 export * from "./schema/ui-theme";
 export * from "./schema/user-persons";
 export * from "./schema/world-info";
+export * from "./schema/chat-knowledge";
 
diff --git a/server/src/db/schema/chat-knowledge.ts b/server/src/db/schema/chat-knowledge.ts
new file mode 100644
index 00000000..fe0b1cbe
--- /dev/null
+++ b/server/src/db/schema/chat-knowledge.ts
@@ -0,0 +1,188 @@
+import { sql } from "drizzle-orm";
+import { index, integer, sqliteTable, text, uniqueIndex } from "drizzle-orm/sqlite-core";
+
+import { chatBranches, chats } from "./chat-core";
+
+export const knowledgeCollections = sqliteTable(
+  "knowledge_collections",
+  {
+    id: text("id").primaryKey(),
+    ownerId: text("owner_id").notNull().default("global"),
+    chatId: text("chat_id")
+      .notNull()
+      .references(() => chats.id, { onDelete: "cascade" }),
+    branchId: text("branch_id").references(() => chatBranches.id, { onDelete: "cascade" }),
+    scope: text("scope", { enum: ["chat", "branch"] }).notNull(),
+    name: text("name").notNull(),
+    kind: text("kind"),
+    description: text("description"),
+    status: text("status", { enum: ["active", "archived", "deleted"] }).notNull().default("active"),
+    origin: text("origin", {
+      enum: ["import", "author", "system_seed", "user", "llm"],
+    })
+      .notNull()
+      .default("author"),
+    layer: text("layer", { enum: ["baseline", "runtime"] }).notNull().default("baseline"),
+    metaJson: text("meta_json"),
+    createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
+    updatedAt: integer("updated_at", { mode: "timestamp_ms" }).notNull(),
+  },
+  (t) => ({
+    ownerChatUpdatedAtIdx: index("knowledge_collections_owner_chat_updated_at_idx").on(
+      t.ownerId,
+      t.chatId,
+      t.updatedAt
+    ),
+    ownerChatBranchNameUnique: uniqueIndex("knowledge_collections_owner_chat_branch_name_uq").on(
+      t.ownerId,
+      t.chatId,
+      t.branchId,
+      t.name
+    ),
+  })
+);
+
+export const knowledgeRecords = sqliteTable(
+  "knowledge_records",
+  {
+    id: text("id").primaryKey(),
+    ownerId: text("owner_id").notNull().default("global"),
+    chatId: text("chat_id")
+      .notNull()
+      .references(() => chats.id, { onDelete: "cascade" }),
+    branchId: text("branch_id").references(() => chatBranches.id, { onDelete: "cascade" }),
+    collectionId: text("collection_id")
+      .notNull()
+      .references(() => knowledgeCollections.id, { onDelete: "cascade" }),
+    recordType: text("record_type").notNull(),
+    key: text("key").notNull(),
+    title: text("title").notNull(),
+    aliasesJson: text("aliases_json").notNull().default("[]"),
+    tagsJson: text("tags_json").notNull().default("[]"),
+    summary: text("summary"),
+    contentJson: text("content_json").notNull().default("null"),
+    searchText: text("search_text").notNull().default(""),
+    accessMode: text("access_mode", {
+      enum: ["public", "discoverable", "hidden", "internal"],
+    })
+      .notNull()
+      .default("public"),
+    origin: text("origin", {
+      enum: ["import", "author", "system_seed", "user", "llm"],
+    })
+      .notNull()
+      .default("author"),
+    layer: text("layer", { enum: ["baseline", "runtime"] }).notNull().default("baseline"),
+    derivedFromRecordId: text("derived_from_record_id"),
+    sourceMessageId: text("source_message_id"),
+    sourceOperationId: text("source_operation_id"),
+    status: text("status", { enum: ["active", "archived", "deleted"] }).notNull().default("active"),
+    gatePolicyJson: text("gate_policy_json"),
+    metaJson: text("meta_json"),
+    createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
+    updatedAt: integer("updated_at", { mode: "timestamp_ms" }).notNull(),
+  },
+  (t) => ({
+    ownerChatBranchUpdatedAtIdx: index("knowledge_records_owner_chat_branch_updated_at_idx").on(
+      t.ownerId,
+      t.chatId,
+      t.branchId,
+      t.updatedAt
+    ),
+    collectionRecordTypeIdx: index("knowledge_records_collection_record_type_idx").on(
+      t.collectionId,
+      t.recordType
+    ),
+    scopeCollectionKeyUnique: uniqueIndex("knowledge_records_scope_collection_key_uq").on(
+      t.chatId,
+      t.branchId,
+      t.collectionId,
+      t.key
+    ),
+    activeCollectionKeyUnique: uniqueIndex("knowledge_records_active_scope_collection_key_uq")
+      .on(t.chatId, t.branchId, t.collectionId, t.key)
+      .where(sql`${t.status} = 'active'`),
+  })
+);
+
+export const knowledgeRecordLinks = sqliteTable(
+  "knowledge_record_links",
+  {
+    id: text("id").primaryKey(),
+    ownerId: text("owner_id").notNull().default("global"),
+    chatId: text("chat_id")
+      .notNull()
+      .references(() => chats.id, { onDelete: "cascade" }),
+    branchId: text("branch_id").references(() => chatBranches.id, { onDelete: "cascade" }),
+    fromRecordId: text("from_record_id")
+      .notNull()
+      .references(() => knowledgeRecords.id, { onDelete: "cascade" }),
+    relationType: text("relation_type").notNull(),
+    toRecordId: text("to_record_id")
+      .notNull()
+      .references(() => knowledgeRecords.id, { onDelete: "cascade" }),
+    metaJson: text("meta_json"),
+    createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
+    updatedAt: integer("updated_at", { mode: "timestamp_ms" }).notNull(),
+  },
+  (t) => ({
+    ownerChatBranchRelationIdx: index("knowledge_record_links_owner_chat_branch_relation_idx").on(
+      t.ownerId,
+      t.chatId,
+      t.branchId,
+      t.relationType
+    ),
+    fromRelationToUnique: uniqueIndex("knowledge_record_links_from_relation_to_uq").on(
+      t.fromRecordId,
+      t.relationType,
+      t.toRecordId
+    ),
+  })
+);
+
+export const knowledgeRecordAccessState = sqliteTable(
+  "knowledge_record_access_state",
+  {
+    id: text("id").primaryKey(),
+    ownerId: text("owner_id").notNull().default("global"),
+    chatId: text("chat_id")
+      .notNull()
+      .references(() => chats.id, { onDelete: "cascade" }),
+    branchId: text("branch_id").references(() => chatBranches.id, { onDelete: "cascade" }),
+    recordId: text("record_id")
+      .notNull()
+      .references(() => knowledgeRecords.id, { onDelete: "cascade" }),
+    discoverState: text("discover_state", {
+      enum: ["hidden", "discoverable", "visible"],
+    })
+      .notNull()
+      .default("hidden"),
+    readState: text("read_state", { enum: ["blocked", "partial", "full"] })
+      .notNull()
+      .default("blocked"),
+    promptState: text("prompt_state", { enum: ["blocked", "allowed"] })
+      .notNull()
+      .default("blocked"),
+    revealState: text("reveal_state", { enum: ["hidden", "revealed"] })
+      .notNull()
+      .default("hidden"),
+    revealedAt: integer("revealed_at", { mode: "timestamp_ms" }),
+    revealedBy: text("revealed_by", { enum: ["system", "user", "llm", "import"] }),
+    revealReason: text("reveal_reason"),
+    flagsJson: text("flags_json").notNull().default("{}"),
+    updatedAt: integer("updated_at", { mode: "timestamp_ms" }).notNull(),
+  },
+  (t) => ({
+    chatBranchRevealIdx: index("knowledge_record_access_state_chat_branch_reveal_idx").on(
+      t.chatId,
+      t.branchId,
+      t.revealState,
+      t.updatedAt
+    ),
+    scopeRecordUnique: uniqueIndex("knowledge_record_access_state_scope_record_uq").on(
+      t.chatId,
+      t.branchId,
+      t.recordId
+    ),
+  })
+);
diff --git a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
index f3fecc1a..2d7140d0 100644
--- a/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
+++ b/server/src/services/chat-generation-v3/operations/execute-operations-phase.ts
@@ -15,6 +15,7 @@ import {
 import { applyPromptEffect } from "./effect-handlers/prompt-effects";
 import { executeGuardOperation } from "./guard-operation-executor";
 import { evaluateGuardRunConditions } from "./guard-run-conditions";
+import { executeKnowledgeOperation } from "./knowledge-operation-executor";
 import { executeLlmOperation } from "./llm-operation-executor";
 
 import type { TaskResult } from "../../../core/operation-orchestrator/types";
@@ -404,6 +405,11 @@ export async function executeOperationsPhase(params: {
   baseArtifacts: Record<string, { value: unknown; history: unknown[] }>;
   assistantText: string;
   templateContext: InstructionRenderContext;
+  knowledgeContext?: {
+    ownerId: string;
+    chatId: string;
+    branchId: string | null;
+  };
   abortSignal?: AbortSignal;
   onOperationStarted?: (data: { hook: OperationHook; opId: string; name: string }) => void;
   onOperationFinished?: (data: OperationFinishedEventData) => void;
@@ -475,15 +481,36 @@ export async function executeOperationsPhase(params: {
   }
 
   const executableOps = runnableOperations.filter(
-    (op): op is Extract<OperationInProfile, { kind: "template" | "llm" | "guard" }> =>
-      op.kind === "template" || op.kind === "llm" || op.kind === "guard"
+    (
+      op
+    ): op is Extract<
+      OperationInProfile,
+      { kind: "template" | "llm" | "guard" | "knowledge_search" | "knowledge_reveal" }
+    > =>
+      op.kind === "template" ||
+      op.kind === "llm" ||
+      op.kind === "guard" ||
+      op.kind === "knowledge_search" ||
+      op.kind === "knowledge_reveal"
   );
   const executableOpsById = new Map(executableOps.map((op) => [op.opId, op]));
   const operationsById = new Map(params.operations.map((op) => [op.opId, op] as const));
   const executableTaskIdSet = new Set(executableOps.map((op) => op.opId));
   const unsupportedOps = runnableOperations.filter(
-    (op): op is Exclude<OperationInProfile, Extract<OperationInProfile, { kind: "template" | "llm" | "guard" }>> =>
-      op.kind !== "template" && op.kind !== "llm" && op.kind !== "guard"
+    (
+      op
+    ): op is Exclude<
+      OperationInProfile,
+      Extract<
+        OperationInProfile,
+        { kind: "template" | "llm" | "guard" | "knowledge_search" | "knowledge_reveal" }
+      >
+    > =>
+      op.kind !== "template" &&
+      op.kind !== "llm" &&
+      op.kind !== "guard" &&
+      op.kind !== "knowledge_search" &&
+      op.kind !== "knowledge_reveal"
   );
 
   const effectsByOpId = new Map<string, RuntimeEffect[]>();
@@ -570,6 +597,24 @@ export async function executeOperationsPhase(params: {
               debugSummary = guardResult.debugSummary;
             }
 
+            if (op.kind === "knowledge_search" || op.kind === "knowledge_reveal") {
+              if (!params.knowledgeContext) {
+                throw new Error("knowledgeContext is required for knowledge operations");
+              }
+              const knowledgeResult = await executeKnowledgeOperation({
+                op,
+                liquidContext,
+                artifacts: depPreview.artifacts,
+                knowledgeContext: params.knowledgeContext,
+              });
+              effectsByOpId.set(op.opId, knowledgeResult.effects);
+              taskResultByOpId.set(op.opId, {
+                effects: knowledgeResult.effects,
+                debugSummary: knowledgeResult.debugSummary,
+              });
+              return knowledgeResult;
+            }
+
             const artifact = op.config.params.artifact;
             const effects: RuntimeEffect[] = [
               {
diff --git a/server/src/services/chat-generation-v3/operations/knowledge-operation-executor.ts b/server/src/services/chat-generation-v3/operations/knowledge-operation-executor.ts
new file mode 100644
index 00000000..4bdbc846
--- /dev/null
+++ b/server/src/services/chat-generation-v3/operations/knowledge-operation-executor.ts
@@ -0,0 +1,135 @@
+import { renderLiquidTemplate } from "../../chat-core/prompt-template-renderer";
+import { revealKnowledgeRecords } from "../../chat-knowledge/knowledge-reveal-service";
+import {
+  searchKnowledgeRecords,
+} from "../../chat-knowledge/knowledge-search-service";
+import {
+  parseKnowledgeRevealOperationParams,
+  parseKnowledgeSearchOperationParams,
+} from "../../operations/knowledge-operation-params";
+import {
+  compileArtifactExposureEffect,
+  getArtifactPrimaryEffectType,
+  type RuntimeEffect,
+} from "../contracts";
+
+import type { InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
+import type {
+  KnowledgeRevealRequest,
+  KnowledgeSearchRequest,
+} from "@shared/types/chat-knowledge";
+import type { OperationInProfile } from "@shared/types/operation-profiles";
+
+type KnowledgeOperation = Extract<
+  OperationInProfile,
+  { kind: "knowledge_search" | "knowledge_reveal" }
+>;
+
+type ArtifactSnapshot = Record<string, { value: unknown; history: unknown[] }>;
+
+type KnowledgeContext = {
+  ownerId: string;
+  chatId: string;
+  branchId: string | null;
+};
+
+function parseJsonPayload<T>(value: unknown, label: string): T {
+  if (typeof value === "string") {
+    try {
+      return JSON.parse(value) as T;
+    } catch (error) {
+      throw new Error(
+        `${label} must be valid JSON: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  if (value && typeof value === "object") {
+    return value as T;
+  }
+  throw new Error(`${label} must resolve to a JSON object`);
+}
+
+async function resolveRequestValue(params: {
+  op: KnowledgeOperation;
+  liquidContext: InstructionRenderContext;
+  artifacts: ArtifactSnapshot;
+}): Promise<KnowledgeSearchRequest | KnowledgeRevealRequest> {
+  const parsed =
+    params.op.kind === "knowledge_search"
+      ? parseKnowledgeSearchOperationParams(params.op.config.params.params)
+      : parseKnowledgeRevealOperationParams(params.op.config.params.params);
+
+  if (parsed.source.mode === "artifact") {
+    const snapshot = params.artifacts[parsed.source.artifactTag];
+    if (!snapshot) {
+      throw new Error(`Artifact with tag ${parsed.source.artifactTag} not found`);
+    }
+    return parseJsonPayload(snapshot.value, `${params.op.kind} artifact request`);
+  }
+
+  const rendered = await renderLiquidTemplate({
+    templateText: parsed.source.requestTemplate,
+    context: params.liquidContext,
+    options: {
+      strictVariables: parsed.source.strictVariables,
+    },
+  });
+  return parseJsonPayload(rendered, `${params.op.kind} inline request`);
+}
+
+export async function executeKnowledgeOperation(params: {
+  op: KnowledgeOperation;
+  liquidContext: InstructionRenderContext;
+  artifacts: ArtifactSnapshot;
+  knowledgeContext: KnowledgeContext;
+}): Promise<{ effects: RuntimeEffect[]; debugSummary: string }> {
+  const request = await resolveRequestValue(params);
+  const value =
+    params.op.kind === "knowledge_search"
+      ? await searchKnowledgeRecords({
+          ownerId: params.knowledgeContext.ownerId,
+          chatId: params.knowledgeContext.chatId,
+          branchId: params.knowledgeContext.branchId,
+          request: request as KnowledgeSearchRequest,
+        })
+      : await revealKnowledgeRecords({
+          ownerId: params.knowledgeContext.ownerId,
+          chatId: params.knowledgeContext.chatId,
+          branchId: params.knowledgeContext.branchId,
+          request: request as KnowledgeRevealRequest,
+        });
+
+  const artifact = params.op.config.params.artifact;
+  const effects: RuntimeEffect[] = [
+    {
+      type: "artifact.upsert",
+      opId: params.op.opId,
+      artifactId: artifact.tag,
+      format: artifact.format,
+      persistence: artifact.persistence,
+      writeMode: artifact.writeMode,
+      history: artifact.history,
+      semantics: artifact.semantics ?? "intermediate",
+      value,
+    },
+    ...artifact.exposures.map((exposure) =>
+      compileArtifactExposureEffect({
+        opId: params.op.opId,
+        artifact,
+        exposure,
+        value,
+      })
+    ),
+  ];
+
+  const count = Array.isArray((value as { hits?: unknown[] }).hits)
+    ? ((value as { hits: unknown[] }).hits?.length ?? 0)
+    : Array.isArray((value as { results?: unknown[] }).results)
+      ? ((value as { results: unknown[] }).results?.length ?? 0)
+      : 0;
+
+  return {
+    effects,
+    debugSummary: `${getArtifactPrimaryEffectType(artifact)}:${count}`,
+  };
+}
diff --git a/server/src/services/chat-generation-v3/operations/knowledge-operations.integration.test.ts b/server/src/services/chat-generation-v3/operations/knowledge-operations.integration.test.ts
new file mode 100644
index 00000000..4ea39e2f
--- /dev/null
+++ b/server/src/services/chat-generation-v3/operations/knowledge-operations.integration.test.ts
@@ -0,0 +1,399 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { normalizeOperationArtifactConfig, type OperationInProfile } from "@shared/types/operation-profiles";
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+
+import { applyMigrations } from "../../../db/apply-migrations";
+import { initDb, resetDbForTests } from "../../../db/client";
+import { chatBranches, chats, entityProfiles } from "../../../db/schema";
+import { createKnowledgeCollection } from "../../chat-knowledge/knowledge-collections-repository";
+import { upsertKnowledgeRecord } from "../../chat-knowledge/knowledge-records-repository";
+
+import { executeOperationsPhase } from "./execute-operations-phase";
+
+import type { InstructionRenderContext } from "../../chat-core/prompt-template-renderer";
+
+function makeTemplateContext(): InstructionRenderContext {
+  return {
+    char: {},
+    user: { name: "User" },
+    chat: {},
+    messages: [],
+    rag: {},
+    art: {},
+    now: new Date("2026-03-21T00:00:00.000Z").toISOString(),
+  };
+}
+
+async function seedChatScope(params: {
+  chatId: string;
+  branchId: string;
+  ownerId?: string;
+}): Promise<void> {
+  const db = await initDb();
+  const ownerId = params.ownerId ?? "global";
+  const now = new Date();
+  const entityProfileId = `entity:${params.chatId}`;
+
+  await db.insert(entityProfiles).values({
+    id: entityProfileId,
+    ownerId,
+    name: `Entity ${params.chatId}`,
+    kind: "CharSpec",
+    specJson: "{}",
+    metaJson: null,
+    isFavorite: false,
+    createdAt: now,
+    updatedAt: now,
+    avatarAssetId: null,
+  });
+
+  await db.insert(chats).values({
+    id: params.chatId,
+    ownerId,
+    entityProfileId,
+    title: `Chat ${params.chatId}`,
+    activeBranchId: params.branchId,
+    instructionId: null,
+    status: "active",
+    createdAt: now,
+    updatedAt: now,
+    lastMessageAt: null,
+    lastMessagePreview: null,
+    version: 0,
+    metaJson: null,
+    originChatId: null,
+    originBranchId: null,
+    originMessageId: null,
+  });
+
+  await db.insert(chatBranches).values({
+    id: params.branchId,
+    ownerId,
+    chatId: params.chatId,
+    title: params.branchId,
+    createdAt: now,
+    updatedAt: now,
+    parentBranchId: null,
+    forkedFromMessageId: null,
+    forkedFromVariantId: null,
+    metaJson: null,
+    currentTurn: 0,
+  });
+}
+
+function makeKnowledgeSearchOp(params: {
+  opId: string;
+  order: number;
+  requestTemplate?: string;
+  artifactTag?: string;
+}): OperationInProfile {
+  return {
+    opId: params.opId,
+    name: params.opId,
+    kind: "knowledge_search",
+    config: {
+      enabled: true,
+      required: false,
+      hooks: ["before_main_llm"],
+      triggers: ["generate", "regenerate"],
+      order: params.order,
+      params: {
+        params: {
+          source: params.requestTemplate
+            ? {
+                mode: "inline",
+                requestTemplate: params.requestTemplate,
+              }
+            : {
+                mode: "artifact",
+                artifactTag: params.artifactTag!,
+              },
+        },
+        artifact: normalizeOperationArtifactConfig({
+          opId: params.opId,
+          kind: "knowledge_search",
+          title: params.opId,
+          rawParams: {
+            artifact: {
+              artifactId: `artifact:${params.opId}`,
+              tag: `${params.opId}_result`,
+              title: `${params.opId} result`,
+              format: "json",
+              persistence: "run_only",
+              writeMode: "replace",
+              history: {
+                enabled: true,
+                maxItems: 20,
+              },
+              exposures: [],
+            },
+          },
+        }),
+      },
+    },
+  } as OperationInProfile;
+}
+
+function makeKnowledgeRevealOp(params: {
+  opId: string;
+  order: number;
+  artifactTag: string;
+  dependsOn?: string[];
+}): OperationInProfile {
+  return {
+    opId: params.opId,
+    name: params.opId,
+    kind: "knowledge_reveal",
+    config: {
+      enabled: true,
+      required: false,
+      hooks: ["before_main_llm"],
+      triggers: ["generate", "regenerate"],
+      order: params.order,
+      dependsOn: params.dependsOn,
+      params: {
+        params: {
+          source: {
+            mode: "artifact",
+            artifactTag: params.artifactTag,
+          },
+        },
+        artifact: normalizeOperationArtifactConfig({
+          opId: params.opId,
+          kind: "knowledge_reveal",
+          title: params.opId,
+          rawParams: {
+            artifact: {
+              artifactId: `artifact:${params.opId}`,
+              tag: `${params.opId}_result`,
+              title: `${params.opId} result`,
+              format: "json",
+              persistence: "run_only",
+              writeMode: "replace",
+              history: {
+                enabled: true,
+                maxItems: 20,
+              },
+              exposures: [],
+            },
+          },
+        }),
+      },
+    },
+  } as OperationInProfile;
+}
+
+describe("knowledge operations integration", () => {
+  let tempDir = "";
+  let prevDataDir: string | undefined;
+
+  beforeEach(async () => {
+    prevDataDir = process.env.TALESPINNER_DATA_DIR;
+    tempDir = await mkdtemp(path.join(tmpdir(), "talespinner-knowledge-ops-"));
+    process.env.TALESPINNER_DATA_DIR = tempDir;
+    resetDbForTests();
+    await initDb();
+    await applyMigrations();
+  });
+
+  afterEach(async () => {
+    resetDbForTests();
+    if (typeof prevDataDir === "string") {
+      process.env.TALESPINNER_DATA_DIR = prevDataDir;
+    } else {
+      delete process.env.TALESPINNER_DATA_DIR;
+    }
+    if (tempDir) {
+      await rm(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  test("knowledge_search reads inline request and writes JSON artifact with hits", async () => {
+    await seedChatScope({ chatId: "chat-ops", branchId: "branch-main" });
+
+    const collection = await createKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-ops",
+      branchId: null,
+      scope: "chat",
+      name: "Lore",
+      kind: "scenario",
+      layer: "baseline",
+      origin: "author",
+    });
+
+    await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-ops",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "location",
+      key: "dark_forest",
+      title: "Dark Forest",
+      aliases: ["Black Forest"],
+      tags: ["forest", "curse"],
+      summary: "A cursed forest",
+      content: { text: "The dark forest is vast." },
+      accessMode: "public",
+      layer: "baseline",
+      origin: "author",
+    });
+
+    const result = await executeOperationsPhase({
+      runId: "run-knowledge-search",
+      hook: "before_main_llm",
+      trigger: "generate",
+      operations: [
+        makeKnowledgeSearchOp({
+          opId: "search-op",
+          order: 10,
+          requestTemplate:
+            "{\"textQuery\":\"dark forest\",\"limit\":5,\"minimumShouldMatch\":1}",
+        }),
+      ],
+      executionMode: "sequential",
+      baseMessages: [
+        { role: "system", content: "sys" },
+        { role: "user", content: "Tell me about the forest" },
+      ],
+      baseArtifacts: {},
+      assistantText: "",
+      templateContext: makeTemplateContext(),
+      knowledgeContext: {
+        ownerId: "global",
+        chatId: "chat-ops",
+        branchId: "branch-main",
+      },
+    });
+
+    expect(result[0]?.status).toBe("done");
+    expect(result[0]?.effects[0]).toMatchObject({
+      type: "artifact.upsert",
+      format: "json",
+    });
+    expect(result[0]?.effects[0]).toMatchObject({
+      value: {
+        hits: [expect.objectContaining({ recordId: expect.any(String) })],
+      },
+    });
+  });
+
+  test("knowledge_reveal reads request artifact and writes applied result artifact", async () => {
+    await seedChatScope({ chatId: "chat-ops-reveal", branchId: "branch-main" });
+
+    const collection = await createKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-ops-reveal",
+      branchId: null,
+      scope: "chat",
+      name: "Mystery",
+      kind: "scenario",
+      layer: "baseline",
+      origin: "author",
+    });
+
+    const record = await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-ops-reveal",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "fact",
+      key: "sealed_room",
+      title: "Sealed Room",
+      aliases: [],
+      tags: ["secret"],
+      summary: "A hidden room under the manor",
+      content: { text: "The sealed room contains the evidence." },
+      accessMode: "discoverable",
+      layer: "baseline",
+      origin: "author",
+      gatePolicy: {
+        read: {
+          all: [{ type: "manual_unlock" }],
+        },
+      },
+    });
+
+    const plannerArtifactValue = {
+      recordIds: [record.id],
+      reason: "manual reveal",
+      revealedBy: "system",
+      context: {
+        manualUnlock: true,
+      },
+    };
+
+    const result = await executeOperationsPhase({
+      runId: "run-knowledge-reveal",
+      hook: "before_main_llm",
+      trigger: "generate",
+      operations: [
+        {
+          opId: "planner-op",
+          name: "planner-op",
+          kind: "template",
+          config: {
+            enabled: true,
+            required: false,
+            hooks: ["before_main_llm"],
+            triggers: ["generate", "regenerate"],
+            order: 10,
+            params: {
+              template: JSON.stringify(plannerArtifactValue),
+              artifact: normalizeOperationArtifactConfig({
+                opId: "planner-op",
+                kind: "template",
+                title: "planner-op",
+                rawParams: {
+                  artifact: {
+                    artifactId: "artifact:planner-op",
+                    tag: "planner_result",
+                    title: "planner result",
+                    format: "json",
+                    persistence: "run_only",
+                    writeMode: "replace",
+                    history: { enabled: true, maxItems: 20 },
+                    exposures: [],
+                  },
+                },
+              }),
+            },
+          },
+        } as OperationInProfile,
+        makeKnowledgeRevealOp({
+          opId: "reveal-op",
+          order: 20,
+          artifactTag: "planner_result",
+          dependsOn: ["planner-op"],
+        }),
+      ],
+      executionMode: "sequential",
+      baseMessages: [
+        { role: "system", content: "sys" },
+        { role: "user", content: "Reveal the hidden room" },
+      ],
+      baseArtifacts: {},
+      assistantText: "",
+      templateContext: makeTemplateContext(),
+      knowledgeContext: {
+        ownerId: "global",
+        chatId: "chat-ops-reveal",
+        branchId: "branch-main",
+      },
+    });
+
+    const byId = new Map(result.map((item) => [item.opId, item] as const));
+    expect(byId.get("planner-op")?.status).toBe("done");
+    expect(byId.get("reveal-op")?.status).toBe("done");
+    expect(byId.get("reveal-op")?.effects[0]).toMatchObject({
+      type: "artifact.upsert",
+      format: "json",
+      value: {
+        results: [expect.objectContaining({ recordId: record.id, status: "revealed" })],
+      },
+    });
+  });
+});
diff --git a/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts b/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
index 14778e2e..86a3c31f 100644
--- a/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
+++ b/server/src/services/chat-generation-v3/orchestration/run-operation-hook-phase.ts
@@ -79,6 +79,11 @@ export async function* runOperationHookPhase(
       baseArtifacts: params.baseArtifacts,
       assistantText: params.assistantText,
       templateContext: params.templateContext,
+      knowledgeContext: {
+        ownerId: params.ownerId,
+        chatId: params.chatId,
+        branchId: params.branchId,
+      },
       abortSignal: params.abortSignal,
       onOperationStarted: (data) => params.emit("operation.started", data),
       onOperationFinished: (data) => params.emit("operation.finished", data),
diff --git a/server/src/services/chat-knowledge/chat-knowledge.integration.test.ts b/server/src/services/chat-knowledge/chat-knowledge.integration.test.ts
new file mode 100644
index 00000000..31c8635b
--- /dev/null
+++ b/server/src/services/chat-knowledge/chat-knowledge.integration.test.ts
@@ -0,0 +1,616 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+
+import { applyMigrations } from "../../db/apply-migrations";
+import { initDb, resetDbForTests } from "../../db/client";
+import { chatBranches, chats, entityProfiles } from "../../db/schema";
+
+import {
+  createKnowledgeCollection,
+  exportKnowledgeCollection,
+  importKnowledgeCollection,
+  listKnowledgeCollections,
+} from "./knowledge-collections-repository";
+import {
+  getKnowledgeRecordById,
+  listKnowledgeRecords,
+  upsertKnowledgeRecord,
+} from "./knowledge-records-repository";
+import { revealKnowledgeRecords } from "./knowledge-reveal-service";
+import { searchKnowledgeRecords } from "./knowledge-search-service";
+
+async function seedChatScope(params: {
+  ownerId?: string;
+  chatId: string;
+  branchIds?: string[];
+}): Promise<void> {
+  const db = await initDb();
+  const ownerId = params.ownerId ?? "global";
+  const now = new Date();
+  const entityProfileId = `entity:${params.chatId}`;
+  const branchIds = params.branchIds ?? [];
+
+  await db.insert(entityProfiles).values({
+    id: entityProfileId,
+    ownerId,
+    name: `Entity ${params.chatId}`,
+    kind: "CharSpec",
+    specJson: "{}",
+    metaJson: null,
+    isFavorite: false,
+    createdAt: now,
+    updatedAt: now,
+    avatarAssetId: null,
+  });
+
+  await db.insert(chats).values({
+    id: params.chatId,
+    ownerId,
+    entityProfileId,
+    title: `Chat ${params.chatId}`,
+    activeBranchId: branchIds[0] ?? null,
+    instructionId: null,
+    status: "active",
+    createdAt: now,
+    updatedAt: now,
+    lastMessageAt: null,
+    lastMessagePreview: null,
+    version: 0,
+    metaJson: null,
+    originChatId: null,
+    originBranchId: null,
+    originMessageId: null,
+  });
+
+  if (branchIds.length > 0) {
+    await db.insert(chatBranches).values(
+      branchIds.map((branchId) => ({
+        id: branchId,
+        ownerId,
+        chatId: params.chatId,
+        title: branchId,
+        createdAt: now,
+        updatedAt: now,
+        parentBranchId: null,
+        forkedFromMessageId: null,
+        forkedFromVariantId: null,
+        metaJson: null,
+        currentTurn: 0,
+      }))
+    );
+  }
+}
+
+describe("chat knowledge integration", () => {
+  let tempDir = "";
+  let prevDataDir: string | undefined;
+
+  beforeEach(async () => {
+    prevDataDir = process.env.TALESPINNER_DATA_DIR;
+    tempDir = await mkdtemp(path.join(tmpdir(), "talespinner-knowledge-"));
+    process.env.TALESPINNER_DATA_DIR = tempDir;
+    resetDbForTests();
+    await initDb();
+    await applyMigrations();
+  });
+
+  afterEach(async () => {
+    resetDbForTests();
+    if (typeof prevDataDir === "string") {
+      process.env.TALESPINNER_DATA_DIR = prevDataDir;
+    } else {
+      delete process.env.TALESPINNER_DATA_DIR;
+    }
+    if (tempDir) {
+      await rm(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  test("creates collections and records, then enforces unique key per scoped collection", async () => {
+    await seedChatScope({ chatId: "chat-1" });
+
+    const collection = await createKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-1",
+      branchId: null,
+      scope: "chat",
+      name: "Lore Pack",
+      kind: "lore",
+      layer: "baseline",
+      origin: "import",
+    });
+
+    const first = await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-1",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "location",
+      key: "dark_forest",
+      title: "Dark Forest",
+      aliases: ["Black Forest"],
+      tags: ["forest", "curse"],
+      summary: "Ancient cursed forest",
+      content: {
+        text: "The Dark Forest is feared by travelers.",
+      },
+      accessMode: "public",
+      layer: "baseline",
+      origin: "import",
+    });
+
+    const second = await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-1",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "location",
+      key: "dark_forest",
+      title: "Dark Forest Revised",
+      aliases: ["Night Forest"],
+      tags: ["forest", "north"],
+      summary: "Updated summary",
+      content: {
+        text: "Updated lore text",
+      },
+      accessMode: "public",
+      layer: "baseline",
+      origin: "import",
+    });
+
+    expect(second.id).toBe(first.id);
+
+    const records = await listKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-1",
+      branchId: null,
+      collectionId: collection.id,
+    });
+    expect(records).toHaveLength(1);
+    expect(records[0]?.title).toBe("Dark Forest Revised");
+  });
+
+  test("search ranks exact key/title over tag and full-text matches", async () => {
+    await seedChatScope({ chatId: "chat-search", branchIds: ["branch-a"] });
+
+    const collection = await createKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-search",
+      branchId: null,
+      scope: "chat",
+      name: "Search Pack",
+      kind: "scenario",
+      layer: "baseline",
+      origin: "author",
+    });
+
+    await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-search",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "location",
+      key: "dark_forest",
+      title: "Dark Forest",
+      aliases: ["Black Forest"],
+      tags: ["forest", "curse"],
+      summary: "Cursed northern forest",
+      content: { text: "Dark forest with ancient curse." },
+      accessMode: "public",
+      layer: "baseline",
+      origin: "author",
+    });
+
+    await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-search",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "location",
+      key: "magic_grove",
+      title: "Magic Grove",
+      aliases: ["Enchanted Forest"],
+      tags: ["forest", "magic"],
+      summary: "Forest filled with old spells",
+      content: { text: "Magic grove with luminous trees." },
+      accessMode: "public",
+      layer: "baseline",
+      origin: "author",
+    });
+
+    const result = await searchKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-search",
+      branchId: "branch-a",
+      request: {
+        textQuery: "dark forest curse",
+        keys: ["dark_forest"],
+        limit: 10,
+        minimumShouldMatch: 1,
+      },
+    });
+
+    expect(result.hits[0]?.record?.key).toBe("dark_forest");
+    expect(result.hits[0]?.matchReasons).toContain("key_exact");
+    expect(result.hits[0]?.score).toBeGreaterThan(result.hits[1]?.score ?? 0);
+  });
+
+  test("search returns discoverable record as preview only until reveal succeeds", async () => {
+    await seedChatScope({ chatId: "chat-reveal", branchIds: ["branch-main"] });
+
+    const collection = await createKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-reveal",
+      branchId: null,
+      scope: "chat",
+      name: "Mystery Pack",
+      kind: "scenario",
+      layer: "baseline",
+      origin: "import",
+    });
+
+    const clue = await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-reveal",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "fact",
+      key: "clue_tablet",
+      title: "Ancient Tablet",
+      aliases: ["Stone Tablet"],
+      tags: ["clue", "tablet"],
+      summary: "An engraved tablet with missing symbols",
+      content: { solution: "The symbol points to the catacombs." },
+      accessMode: "public",
+      layer: "baseline",
+      origin: "import",
+    });
+
+    const hidden = await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-reveal",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "fact",
+      key: "catacomb_secret",
+      title: "Catacomb Secret",
+      aliases: ["Hidden Passage"],
+      tags: ["secret", "catacomb"],
+      summary: "There is a sealed route below the ruins",
+      content: { spoiler: "The king's remains are hidden there." },
+      accessMode: "discoverable",
+      layer: "baseline",
+      origin: "import",
+      gatePolicy: {
+        read: {
+          all: [{ type: "record_revealed", recordKey: "clue_tablet" }],
+        },
+        prompt: {
+          all: [{ type: "record_revealed", recordKey: "clue_tablet" }],
+        },
+      },
+    });
+
+    const before = await searchKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-reveal",
+      branchId: "branch-main",
+      request: {
+        textQuery: "catacomb secret",
+        limit: 10,
+      },
+    });
+
+    const beforeHit = before.hits.find((item) => item.recordId === hidden.id);
+    expect(beforeHit?.visibility).toBe("preview");
+    expect(beforeHit?.record).toBeNull();
+    expect(beforeHit?.preview.title).toBe("Catacomb Secret");
+
+    const failedReveal = await revealKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-reveal",
+      branchId: "branch-main",
+      request: {
+        recordIds: [hidden.id],
+        reason: "premature",
+        revealedBy: "llm",
+      },
+    });
+
+    expect(failedReveal.results[0]).toMatchObject({
+      recordId: hidden.id,
+      status: "blocked",
+    });
+
+    await revealKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-reveal",
+      branchId: "branch-main",
+      request: {
+        recordIds: [clue.id],
+        reason: "found tablet",
+        revealedBy: "system",
+        context: {
+          manualUnlock: true,
+        },
+      },
+    });
+
+    const successfulReveal = await revealKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-reveal",
+      branchId: "branch-main",
+      request: {
+        recordIds: [hidden.id],
+        reason: "clue chain satisfied",
+        revealedBy: "system",
+      },
+    });
+
+    expect(successfulReveal.results[0]).toMatchObject({
+      recordId: hidden.id,
+      status: "revealed",
+    });
+
+    const after = await searchKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-reveal",
+      branchId: "branch-main",
+      request: {
+        textQuery: "catacomb secret",
+        limit: 10,
+      },
+    });
+
+    const afterHit = after.hits.find((item) => item.recordId === hidden.id);
+    expect(afterHit?.visibility).toBe("full");
+    expect(afterHit?.record?.content).toEqual({ spoiler: "The king's remains are hidden there." });
+
+    const persisted = await getKnowledgeRecordById(hidden.id);
+    expect(persisted?.content).toEqual({ spoiler: "The king's remains are hidden there." });
+  });
+
+  test("reveal supports flag_equals context predicate", async () => {
+    await seedChatScope({ chatId: "chat-flags", branchIds: ["branch-flags"] });
+
+    const collection = await createKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-flags",
+      branchId: null,
+      scope: "chat",
+      name: "Flags Pack",
+      kind: "scenario",
+      layer: "baseline",
+      origin: "author",
+    });
+
+    const record = await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-flags",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "fact",
+      key: "vault_code",
+      title: "Vault Code",
+      aliases: [],
+      tags: ["vault"],
+      summary: "The code is written under the altar",
+      content: { code: "8132" },
+      accessMode: "discoverable",
+      layer: "baseline",
+      origin: "author",
+      gatePolicy: {
+        read: {
+          all: [{ type: "flag_equals", key: "quest.has_map", value: true }],
+        },
+      },
+    });
+
+    const blocked = await revealKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-flags",
+      branchId: "branch-flags",
+      request: {
+        recordIds: [record.id],
+        reason: "missing flag",
+        revealedBy: "llm",
+        context: {
+          flags: {
+            "quest.has_map": false,
+          },
+        },
+      },
+    });
+
+    expect(blocked.results[0]?.status).toBe("blocked");
+
+    const allowed = await revealKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-flags",
+      branchId: "branch-flags",
+      request: {
+        recordIds: [record.id],
+        reason: "flag set",
+        revealedBy: "system",
+        context: {
+          flags: {
+            "quest.has_map": true,
+          },
+        },
+      },
+    });
+
+    expect(allowed.results[0]?.status).toBe("revealed");
+  });
+
+  test("branch overlay does not leak branch-scoped records into sibling branch", async () => {
+    await seedChatScope({ chatId: "chat-branches", branchIds: ["branch-a", "branch-b"] });
+
+    const collection = await createKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-branches",
+      branchId: null,
+      scope: "chat",
+      name: "Branch Pack",
+      kind: "scenario",
+      layer: "baseline",
+      origin: "author",
+    });
+
+    await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-branches",
+      branchId: "branch-a",
+      collectionId: collection.id,
+      recordType: "note",
+      key: "branch_a_note",
+      title: "Branch A Note",
+      aliases: [],
+      tags: ["branch"],
+      summary: "Only branch A should see this",
+      content: { note: "A only" },
+      accessMode: "public",
+      layer: "runtime",
+      origin: "llm",
+    });
+
+    const branchA = await searchKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-branches",
+      branchId: "branch-a",
+      request: {
+        textQuery: "branch a note",
+        limit: 10,
+      },
+    });
+    expect(branchA.hits.some((item) => item.record?.key === "branch_a_note")).toBe(true);
+
+    const branchB = await searchKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-branches",
+      branchId: "branch-b",
+      request: {
+        textQuery: "branch a note",
+        limit: 10,
+      },
+    });
+    expect(branchB.hits.some((item) => item.record?.key === "branch_a_note")).toBe(false);
+  });
+
+  test("export/import support baseline and runtime filtering", async () => {
+    await seedChatScope({
+      chatId: "chat-export",
+      branchIds: ["branch-export"],
+    });
+    await seedChatScope({ chatId: "chat-imported" });
+
+    const collection = await createKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-export",
+      branchId: null,
+      scope: "chat",
+      name: "Export Pack",
+      kind: "scenario",
+      layer: "baseline",
+      origin: "import",
+    });
+
+    const baseline = await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-export",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "location",
+      key: "city",
+      title: "Old City",
+      aliases: [],
+      tags: ["city"],
+      summary: "Original city record",
+      content: { text: "Baseline city." },
+      accessMode: "public",
+      layer: "baseline",
+      origin: "import",
+    });
+
+    const runtime = await upsertKnowledgeRecord({
+      ownerId: "global",
+      chatId: "chat-export",
+      branchId: null,
+      collectionId: collection.id,
+      recordType: "note",
+      key: "runtime_note",
+      title: "Runtime Note",
+      aliases: [],
+      tags: ["note"],
+      summary: "Created in play",
+      content: { text: "Runtime note." },
+      accessMode: "public",
+      layer: "runtime",
+      origin: "llm",
+      derivedFromRecordId: baseline.id,
+    });
+
+    await revealKnowledgeRecords({
+      ownerId: "global",
+      chatId: "chat-export",
+      branchId: "branch-export",
+      request: {
+        recordIds: [baseline.id],
+        revealedBy: "system",
+        reason: "baseline reveal",
+        context: { manualUnlock: true },
+      },
+    });
+
+    const baselineOnly = await exportKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-export",
+      branchId: "branch-export",
+      collectionId: collection.id,
+      mode: "baseline_only",
+    });
+    expect(baselineOnly.records.map((item) => item.key)).toEqual(["city"]);
+
+    const runtimeOnly = await exportKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-export",
+      branchId: "branch-export",
+      collectionId: collection.id,
+      mode: "runtime_only",
+    });
+    expect(runtimeOnly.records.map((item) => item.key)).toEqual(["runtime_note"]);
+
+    const baselineWithReveals = await exportKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-export",
+      branchId: "branch-export",
+      collectionId: collection.id,
+      mode: "baseline_with_reveals",
+    });
+    expect(baselineWithReveals.records.map((item) => item.key)).toEqual(["city"]);
+    expect(baselineWithReveals.accessState).toHaveLength(1);
+
+    const imported = await importKnowledgeCollection({
+      ownerId: "global",
+      chatId: "chat-imported",
+      branchId: null,
+      payload: baselineOnly,
+    });
+
+    const collections = await listKnowledgeCollections({
+      ownerId: "global",
+      chatId: "chat-imported",
+      branchId: null,
+    });
+
+    expect(imported.collection.id).toBeTruthy();
+    expect(collections.map((item) => item.name)).toContain("Export Pack");
+    expect(imported.records).toHaveLength(1);
+    expect(imported.records[0]?.key).toBe("city");
+
+    expect(runtime.id).toBeTruthy();
+  });
+});
diff --git a/server/src/services/chat-knowledge/knowledge-access-repository.ts b/server/src/services/chat-knowledge/knowledge-access-repository.ts
new file mode 100644
index 00000000..d1bba54c
--- /dev/null
+++ b/server/src/services/chat-knowledge/knowledge-access-repository.ts
@@ -0,0 +1,133 @@
+import { randomUUID as uuidv4 } from "node:crypto";
+
+import { and, eq, isNull, or } from "drizzle-orm";
+
+import { initDb } from "../../db/client";
+import { knowledgeRecordAccessState } from "../../db/schema";
+
+import {
+  encodeJson,
+  rowToKnowledgeRecordAccessStateDto,
+} from "./knowledge-helpers";
+
+import type {
+  KnowledgeDiscoverState,
+  KnowledgePromptState,
+  KnowledgeReadState,
+  KnowledgeRecordAccessStateDto,
+  KnowledgeRevealActor,
+  KnowledgeRevealState,
+} from "@shared/types/chat-knowledge";
+
+export async function listKnowledgeRecordAccessState(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+}): Promise<KnowledgeRecordAccessStateDto[]> {
+  const db = await initDb();
+  const rows = await db
+    .select()
+    .from(knowledgeRecordAccessState)
+    .where(
+      and(
+        eq(knowledgeRecordAccessState.ownerId, params.ownerId ?? "global"),
+        eq(knowledgeRecordAccessState.chatId, params.chatId),
+        or(
+          params.branchId === null
+            ? isNull(knowledgeRecordAccessState.branchId)
+            : eq(knowledgeRecordAccessState.branchId, params.branchId),
+          isNull(knowledgeRecordAccessState.branchId)
+        )
+      )
+    );
+  return rows.map(rowToKnowledgeRecordAccessStateDto);
+}
+
+export async function getKnowledgeRecordAccessState(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  recordId: string;
+}): Promise<KnowledgeRecordAccessStateDto | null> {
+  const db = await initDb();
+  const rows = await db
+    .select()
+    .from(knowledgeRecordAccessState)
+    .where(
+      and(
+        eq(knowledgeRecordAccessState.ownerId, params.ownerId ?? "global"),
+        eq(knowledgeRecordAccessState.chatId, params.chatId),
+        params.branchId === null
+          ? isNull(knowledgeRecordAccessState.branchId)
+          : eq(knowledgeRecordAccessState.branchId, params.branchId),
+        eq(knowledgeRecordAccessState.recordId, params.recordId)
+      )
+    )
+    .limit(1);
+  return rows[0] ? rowToKnowledgeRecordAccessStateDto(rows[0]) : null;
+}
+
+export async function upsertKnowledgeAccessState(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  recordId: string;
+  discoverState: KnowledgeDiscoverState;
+  readState: KnowledgeReadState;
+  promptState: KnowledgePromptState;
+  revealState: KnowledgeRevealState;
+  revealedAt?: Date | null;
+  revealedBy?: KnowledgeRevealActor | null;
+  revealReason?: string | null;
+  flags?: Record<string, unknown>;
+}): Promise<KnowledgeRecordAccessStateDto> {
+  const db = await initDb();
+  const now = new Date();
+  await db
+    .insert(knowledgeRecordAccessState)
+    .values({
+      id: uuidv4(),
+      ownerId: params.ownerId ?? "global",
+      chatId: params.chatId,
+      branchId: params.branchId,
+      recordId: params.recordId,
+      discoverState: params.discoverState,
+      readState: params.readState,
+      promptState: params.promptState,
+      revealState: params.revealState,
+      revealedAt: params.revealedAt ?? null,
+      revealedBy: params.revealedBy ?? null,
+      revealReason: params.revealReason ?? null,
+      flagsJson: encodeJson(params.flags ?? {}, "{}"),
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: [
+        knowledgeRecordAccessState.chatId,
+        knowledgeRecordAccessState.branchId,
+        knowledgeRecordAccessState.recordId,
+      ],
+      set: {
+        discoverState: params.discoverState,
+        readState: params.readState,
+        promptState: params.promptState,
+        revealState: params.revealState,
+        revealedAt: params.revealedAt ?? null,
+        revealedBy: params.revealedBy ?? null,
+        revealReason: params.revealReason ?? null,
+        flagsJson: encodeJson(params.flags ?? {}, "{}"),
+        updatedAt: now,
+      },
+    });
+
+  const reloaded = await getKnowledgeRecordAccessState({
+    ownerId: params.ownerId,
+    chatId: params.chatId,
+    branchId: params.branchId,
+    recordId: params.recordId,
+  });
+  if (!reloaded) {
+    throw new Error("Failed to upsert knowledge access state");
+  }
+  return reloaded;
+}
diff --git a/server/src/services/chat-knowledge/knowledge-collections-repository.ts b/server/src/services/chat-knowledge/knowledge-collections-repository.ts
new file mode 100644
index 00000000..99073d78
--- /dev/null
+++ b/server/src/services/chat-knowledge/knowledge-collections-repository.ts
@@ -0,0 +1,257 @@
+import { randomUUID as uuidv4 } from "node:crypto";
+
+import { and, eq, isNull, or } from "drizzle-orm";
+
+import { initDb } from "../../db/client";
+import { knowledgeCollections } from "../../db/schema";
+
+import { listKnowledgeRecordAccessState, upsertKnowledgeAccessState } from "./knowledge-access-repository";
+import {
+  encodeJson,
+  rowToKnowledgeCollectionDto,
+} from "./knowledge-helpers";
+import { createKnowledgeRecordLinksBulk, listKnowledgeRecordLinks } from "./knowledge-links-repository";
+import { listKnowledgeRecords, upsertKnowledgeRecord } from "./knowledge-records-repository";
+
+import type {
+  KnowledgeCollectionDto,
+  KnowledgeCollectionExportPayload,
+  KnowledgeCollectionImportResult,
+  KnowledgeExportMode,
+  KnowledgeLayer,
+  KnowledgeOrigin,
+  KnowledgeScope,
+} from "@shared/types/chat-knowledge";
+
+function shouldIncludeRecordForExport(
+  mode: KnowledgeExportMode,
+  layer: KnowledgeLayer
+): boolean {
+  if (mode === "baseline_plus_runtime") return true;
+  if (mode === "baseline_only" || mode === "baseline_with_reveals") return layer === "baseline";
+  return layer === "runtime";
+}
+
+export async function createKnowledgeCollection(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  scope: KnowledgeScope;
+  name: string;
+  kind?: string | null;
+  description?: string | null;
+  status?: "active" | "archived" | "deleted";
+  origin: KnowledgeOrigin;
+  layer: KnowledgeLayer;
+  meta?: unknown;
+}): Promise<KnowledgeCollectionDto> {
+  const db = await initDb();
+  const id = uuidv4();
+  const now = new Date();
+  await db.insert(knowledgeCollections).values({
+    id,
+    ownerId: params.ownerId ?? "global",
+    chatId: params.chatId,
+    branchId: params.branchId,
+    scope: params.scope,
+    name: params.name,
+    kind: params.kind ?? null,
+    description: params.description ?? null,
+    status: params.status ?? "active",
+    origin: params.origin,
+    layer: params.layer,
+    metaJson: typeof params.meta === "undefined" ? null : encodeJson(params.meta, "null"),
+    createdAt: now,
+    updatedAt: now,
+  });
+  const created = await getKnowledgeCollectionById(id);
+  if (!created) throw new Error("Failed to create knowledge collection");
+  return created;
+}
+
+export async function getKnowledgeCollectionById(
+  id: string
+): Promise<KnowledgeCollectionDto | null> {
+  const db = await initDb();
+  const rows = await db
+    .select()
+    .from(knowledgeCollections)
+    .where(eq(knowledgeCollections.id, id))
+    .limit(1);
+  return rows[0] ? rowToKnowledgeCollectionDto(rows[0]) : null;
+}
+
+export async function listKnowledgeCollections(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+}): Promise<KnowledgeCollectionDto[]> {
+  const db = await initDb();
+  const rows = await db
+    .select()
+    .from(knowledgeCollections)
+    .where(
+      and(
+        eq(knowledgeCollections.ownerId, params.ownerId ?? "global"),
+        eq(knowledgeCollections.chatId, params.chatId),
+        params.branchId === null
+          ? isNull(knowledgeCollections.branchId)
+          : or(
+              isNull(knowledgeCollections.branchId),
+              eq(knowledgeCollections.branchId, params.branchId)
+            )
+      )
+    );
+  return rows.map(rowToKnowledgeCollectionDto);
+}
+
+export async function exportKnowledgeCollection(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  collectionId: string;
+  mode: KnowledgeExportMode;
+}): Promise<KnowledgeCollectionExportPayload> {
+  const collection = await getKnowledgeCollectionById(params.collectionId);
+  if (!collection) throw new Error("Knowledge collection not found");
+
+  const records = (await listKnowledgeRecords({
+    ownerId: params.ownerId,
+    chatId: params.chatId,
+    branchId: params.branchId,
+    collectionId: params.collectionId,
+  })).filter((item) => shouldIncludeRecordForExport(params.mode, item.layer));
+
+  const recordIds = new Set(records.map((item) => item.id));
+  const links = (await listKnowledgeRecordLinks({
+    ownerId: params.ownerId,
+    chatId: params.chatId,
+    branchId: params.branchId,
+  })).filter((item) => recordIds.has(item.fromRecordId) && recordIds.has(item.toRecordId));
+
+  const accessState =
+    params.mode === "baseline_with_reveals" ||
+    params.mode === "runtime_only" ||
+    params.mode === "baseline_plus_runtime"
+      ? (await listKnowledgeRecordAccessState({
+          ownerId: params.ownerId,
+          chatId: params.chatId,
+          branchId: params.branchId,
+        })).filter((item) => recordIds.has(item.recordId))
+      : [];
+
+  return {
+    version: 1,
+    collection: {
+      ownerId: collection.ownerId,
+      chatId: collection.chatId,
+      branchId: collection.branchId,
+      scope: collection.scope,
+      name: collection.name,
+      kind: collection.kind,
+      description: collection.description,
+      status: collection.status,
+      origin: collection.origin,
+      layer: collection.layer,
+      meta: collection.meta,
+      sourceCollectionId: collection.id,
+    },
+    records,
+    links,
+    accessState,
+    mode: params.mode,
+  };
+}
+
+export async function importKnowledgeCollection(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  payload: KnowledgeCollectionExportPayload;
+}): Promise<KnowledgeCollectionImportResult> {
+  const collection = await createKnowledgeCollection({
+    ownerId: params.ownerId ?? params.payload.collection.ownerId,
+    chatId: params.chatId,
+    branchId: params.branchId,
+    scope: params.payload.collection.scope,
+    name: params.payload.collection.name,
+    kind: params.payload.collection.kind,
+    description: params.payload.collection.description,
+    status: params.payload.collection.status,
+    origin: params.payload.collection.origin,
+    layer: params.payload.collection.layer,
+    meta: params.payload.collection.meta,
+  });
+
+  const idMap = new Map<string, string>();
+  const importedRecords = [];
+  for (const item of params.payload.records) {
+    const created = await upsertKnowledgeRecord({
+      ownerId: params.ownerId ?? item.ownerId,
+      chatId: params.chatId,
+      branchId: params.branchId,
+      collectionId: collection.id,
+      recordType: item.recordType,
+      key: item.key,
+      title: item.title,
+      aliases: item.aliases,
+      tags: item.tags,
+      summary: item.summary,
+      content: item.content,
+      accessMode: item.accessMode,
+      origin: item.origin,
+      layer: item.layer,
+      derivedFromRecordId: null,
+      sourceMessageId: item.sourceMessageId,
+      sourceOperationId: item.sourceOperationId,
+      status: item.status,
+      gatePolicy: item.gatePolicy,
+      meta: item.meta,
+    });
+    idMap.set(item.id, created.id);
+    importedRecords.push(created);
+  }
+
+  const importedLinks = await createKnowledgeRecordLinksBulk({
+    ownerId: params.ownerId ?? "global",
+    chatId: params.chatId,
+    branchId: params.branchId,
+    items: params.payload.links
+      .map((item) => ({
+        fromRecordId: idMap.get(item.fromRecordId) ?? "",
+        relationType: item.relationType,
+        toRecordId: idMap.get(item.toRecordId) ?? "",
+        meta: item.meta,
+      }))
+      .filter((item) => item.fromRecordId.length > 0 && item.toRecordId.length > 0),
+  });
+
+  const importedAccessState = [];
+  for (const item of params.payload.accessState) {
+    const nextRecordId = idMap.get(item.recordId);
+    if (!nextRecordId) continue;
+    importedAccessState.push(
+      await upsertKnowledgeAccessState({
+        ownerId: params.ownerId ?? item.ownerId,
+        chatId: params.chatId,
+        branchId: params.branchId,
+        recordId: nextRecordId,
+        discoverState: item.discoverState,
+        readState: item.readState,
+        promptState: item.promptState,
+        revealState: item.revealState,
+        revealedAt: item.revealedAt,
+        revealedBy: item.revealedBy,
+        revealReason: item.revealReason,
+        flags: item.flags,
+      })
+    );
+  }
+
+  return {
+    collection,
+    records: importedRecords,
+    links: importedLinks,
+    accessState: importedAccessState,
+  };
+}
diff --git a/server/src/services/chat-knowledge/knowledge-gate-policy.ts b/server/src/services/chat-knowledge/knowledge-gate-policy.ts
new file mode 100644
index 00000000..007c9d22
--- /dev/null
+++ b/server/src/services/chat-knowledge/knowledge-gate-policy.ts
@@ -0,0 +1,146 @@
+import { getKnowledgeRecordAccessState } from "./knowledge-access-repository";
+import { findKnowledgeRecordsByKeys } from "./knowledge-records-repository";
+
+import type {
+  KnowledgeAccessMode,
+  KnowledgeGateExpression,
+  KnowledgeGateNode,
+  KnowledgeGatePredicate,
+  KnowledgeRecordDto,
+  KnowledgeRuntimeContext,
+} from "@shared/types/chat-knowledge";
+
+type EvaluationEnv = {
+  ownerId: string;
+  chatId: string;
+  branchId: string | null;
+  context?: KnowledgeRuntimeContext;
+};
+
+export function getDefaultAccessSnapshot(accessMode: KnowledgeAccessMode) {
+  if (accessMode === "public") {
+    return {
+      discoverState: "visible" as const,
+      readState: "full" as const,
+      promptState: "allowed" as const,
+      revealState: "hidden" as const,
+    };
+  }
+  if (accessMode === "discoverable") {
+    return {
+      discoverState: "discoverable" as const,
+      readState: "blocked" as const,
+      promptState: "blocked" as const,
+      revealState: "hidden" as const,
+    };
+  }
+  return {
+    discoverState: "hidden" as const,
+    readState: "blocked" as const,
+    promptState: "blocked" as const,
+    revealState: "hidden" as const,
+  };
+}
+
+async function resolveRecordState(params: {
+  predicate: Extract<KnowledgeGatePredicate, { type: "record_revealed" | "record_state" }>;
+  env: EvaluationEnv;
+}) {
+  const { predicate, env } = params;
+  let recordId = predicate.recordId;
+  if (!recordId && predicate.recordKey) {
+    const records = await findKnowledgeRecordsByKeys({
+      ownerId: env.ownerId,
+      chatId: env.chatId,
+      branchId: env.branchId,
+      keys: [predicate.recordKey],
+    });
+    recordId = records[0]?.id;
+  }
+  if (!recordId) return null;
+  return getKnowledgeRecordAccessState({
+    ownerId: env.ownerId,
+    chatId: env.chatId,
+    branchId: env.branchId,
+    recordId,
+  });
+}
+
+async function evaluatePredicate(params: {
+  predicate: KnowledgeGatePredicate;
+  env: EvaluationEnv;
+}): Promise<boolean> {
+  const { predicate, env } = params;
+  if (predicate.type === "flag_equals") {
+    return env.context?.flags?.[predicate.key] === predicate.value;
+  }
+  if (predicate.type === "counter_gte") {
+    return (env.context?.counters?.[predicate.key] ?? 0) >= predicate.value;
+  }
+  if (predicate.type === "manual_unlock") {
+    return env.context?.manualUnlock === true;
+  }
+  if (predicate.type === "branch_only") {
+    return predicate.branchId ? predicate.branchId === env.branchId : env.branchId !== null;
+  }
+
+  const state = await resolveRecordState({
+    predicate,
+    env,
+  });
+  if (!state) return false;
+  if (predicate.type === "record_revealed") {
+    return state.revealState === "revealed";
+  }
+  if (predicate.revealState && state.revealState !== predicate.revealState) return false;
+  if (predicate.readState && state.readState !== predicate.readState) return false;
+  if (predicate.promptState && state.promptState !== predicate.promptState) return false;
+  return true;
+}
+
+async function evaluateNode(params: {
+  node: KnowledgeGateNode;
+  env: EvaluationEnv;
+}): Promise<boolean> {
+  const { node, env } = params;
+  if ("type" in node) {
+    return evaluatePredicate({
+      predicate: node,
+      env,
+    });
+  }
+  if ("all" in node) {
+    for (const item of node.all) {
+      if (!(await evaluateNode({ node: item, env }))) return false;
+    }
+    return true;
+  }
+  if ("any" in node) {
+    for (const item of node.any) {
+      if (await evaluateNode({ node: item, env })) return true;
+    }
+    return false;
+  }
+  return !(await evaluateNode({ node: node.not, env }));
+}
+
+export async function evaluateKnowledgeGate(params: {
+  record: KnowledgeRecordDto;
+  gate?: { mode?: "always" } | KnowledgeGateExpression;
+  ownerId: string;
+  chatId: string;
+  branchId: string | null;
+  context?: KnowledgeRuntimeContext;
+}): Promise<boolean> {
+  if (!params.gate) return true;
+  if ("mode" in params.gate) return params.gate.mode === "always";
+  return evaluateNode({
+    node: params.gate as KnowledgeGateExpression,
+    env: {
+      ownerId: params.ownerId,
+      chatId: params.chatId,
+      branchId: params.branchId,
+      context: params.context,
+    },
+  });
+}
diff --git a/server/src/services/chat-knowledge/knowledge-helpers.ts b/server/src/services/chat-knowledge/knowledge-helpers.ts
new file mode 100644
index 00000000..1eaf7b24
--- /dev/null
+++ b/server/src/services/chat-knowledge/knowledge-helpers.ts
@@ -0,0 +1,148 @@
+import { safeJsonParse, safeJsonStringify } from "../../chat-core/json";
+
+import type {
+  knowledgeCollections,
+  knowledgeRecordAccessState,
+  knowledgeRecordLinks,
+  knowledgeRecords,
+} from "../../db/schema";
+import type {
+  KnowledgeAccessMode,
+  KnowledgeCollectionDto,
+  KnowledgeGatePolicy,
+  KnowledgeLayer,
+  KnowledgeOrigin,
+  KnowledgeRecordAccessStateDto,
+  KnowledgeRecordDto,
+  KnowledgeRecordLinkDto,
+} from "@shared/types/chat-knowledge";
+
+function normalizeStringArray(input: unknown): string[] {
+  if (!Array.isArray(input)) return [];
+  return Array.from(
+    new Set(
+      input
+        .map((item) => (typeof item === "string" ? item.trim() : ""))
+        .filter((item) => item.length > 0)
+    )
+  );
+}
+
+function flattenContent(value: unknown): string[] {
+  if (typeof value === "string") return [value];
+  if (typeof value === "number" || typeof value === "boolean") return [String(value)];
+  if (!value || typeof value !== "object") return [];
+  if (Array.isArray(value)) return value.flatMap((item) => flattenContent(item));
+  return Object.values(value as Record<string, unknown>).flatMap((item) => flattenContent(item));
+}
+
+export function buildKnowledgeSearchText(params: {
+  title: string;
+  aliases: string[];
+  tags: string[];
+  summary?: string | null;
+  content: unknown;
+  accessMode: KnowledgeAccessMode;
+}): string {
+  const base = [params.title, ...params.aliases, ...params.tags, params.summary ?? ""];
+  const contentText =
+    params.accessMode === "public" ? flattenContent(params.content) : [];
+  return [...base, ...contentText]
+    .map((item) => item.trim())
+    .filter((item) => item.length > 0)
+    .join(" ");
+}
+
+export function rowToKnowledgeCollectionDto(
+  row: typeof knowledgeCollections.$inferSelect
+): KnowledgeCollectionDto {
+  return {
+    id: row.id,
+    ownerId: row.ownerId,
+    chatId: row.chatId,
+    branchId: row.branchId ?? null,
+    scope: row.scope,
+    name: row.name,
+    kind: row.kind ?? null,
+    description: row.description ?? null,
+    status: row.status,
+    origin: row.origin,
+    layer: row.layer,
+    meta: safeJsonParse(row.metaJson, null),
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+}
+
+export function rowToKnowledgeRecordDto(
+  row: typeof knowledgeRecords.$inferSelect
+): KnowledgeRecordDto {
+  return {
+    id: row.id,
+    ownerId: row.ownerId,
+    chatId: row.chatId,
+    branchId: row.branchId ?? null,
+    collectionId: row.collectionId,
+    recordType: row.recordType,
+    key: row.key,
+    title: row.title,
+    aliases: normalizeStringArray(safeJsonParse(row.aliasesJson, [])),
+    tags: normalizeStringArray(safeJsonParse(row.tagsJson, [])),
+    summary: row.summary ?? null,
+    content: safeJsonParse(row.contentJson, null),
+    searchText: row.searchText,
+    accessMode: row.accessMode,
+    origin: row.origin as KnowledgeOrigin,
+    layer: row.layer as KnowledgeLayer,
+    derivedFromRecordId: row.derivedFromRecordId ?? null,
+    sourceMessageId: row.sourceMessageId ?? null,
+    sourceOperationId: row.sourceOperationId ?? null,
+    status: row.status,
+    gatePolicy: safeJsonParse<KnowledgeGatePolicy | null>(row.gatePolicyJson, null),
+    meta: safeJsonParse(row.metaJson, null),
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+}
+
+export function rowToKnowledgeRecordLinkDto(
+  row: typeof knowledgeRecordLinks.$inferSelect
+): KnowledgeRecordLinkDto {
+  return {
+    id: row.id,
+    ownerId: row.ownerId,
+    chatId: row.chatId,
+    branchId: row.branchId ?? null,
+    fromRecordId: row.fromRecordId,
+    relationType: row.relationType,
+    toRecordId: row.toRecordId,
+    meta: safeJsonParse(row.metaJson, null),
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+}
+
+export function rowToKnowledgeRecordAccessStateDto(
+  row: typeof knowledgeRecordAccessState.$inferSelect
+): KnowledgeRecordAccessStateDto {
+  return {
+    id: row.id,
+    ownerId: row.ownerId,
+    chatId: row.chatId,
+    branchId: row.branchId ?? null,
+    recordId: row.recordId,
+    discoverState: row.discoverState,
+    readState: row.readState,
+    promptState: row.promptState,
+    revealState: row.revealState,
+    revealedAt: row.revealedAt ?? null,
+    revealedBy: row.revealedBy ?? null,
+    revealReason: row.revealReason ?? null,
+    flags: safeJsonParse<Record<string, unknown>>(row.flagsJson, {}),
+    updatedAt: row.updatedAt,
+  };
+}
+
+export function encodeJson(value: unknown, fallback: string): string {
+  return safeJsonStringify(value, fallback);
+}
diff --git a/server/src/services/chat-knowledge/knowledge-links-repository.ts b/server/src/services/chat-knowledge/knowledge-links-repository.ts
new file mode 100644
index 00000000..1b59fd5d
--- /dev/null
+++ b/server/src/services/chat-knowledge/knowledge-links-repository.ts
@@ -0,0 +1,72 @@
+import { randomUUID as uuidv4 } from "node:crypto";
+
+import { and, eq, isNull, or } from "drizzle-orm";
+
+import { initDb } from "../../db/client";
+import { knowledgeRecordLinks } from "../../db/schema";
+
+import { encodeJson, rowToKnowledgeRecordLinkDto } from "./knowledge-helpers";
+
+import type { KnowledgeRecordLinkDto } from "@shared/types/chat-knowledge";
+
+export async function createKnowledgeRecordLinksBulk(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  items: Array<{
+    fromRecordId: string;
+    relationType: string;
+    toRecordId: string;
+    meta?: unknown;
+  }>;
+}): Promise<KnowledgeRecordLinkDto[]> {
+  if (params.items.length === 0) return [];
+  const db = await initDb();
+  const now = new Date();
+  await db
+    .insert(knowledgeRecordLinks)
+    .values(
+      params.items.map((item) => ({
+        id: uuidv4(),
+        ownerId: params.ownerId ?? "global",
+        chatId: params.chatId,
+        branchId: params.branchId,
+        fromRecordId: item.fromRecordId,
+        relationType: item.relationType,
+        toRecordId: item.toRecordId,
+        metaJson: typeof item.meta === "undefined" ? null : encodeJson(item.meta, "null"),
+        createdAt: now,
+        updatedAt: now,
+      }))
+    )
+    .onConflictDoNothing();
+  return listKnowledgeRecordLinks({
+    ownerId: params.ownerId,
+    chatId: params.chatId,
+    branchId: params.branchId,
+  });
+}
+
+export async function listKnowledgeRecordLinks(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+}): Promise<KnowledgeRecordLinkDto[]> {
+  const db = await initDb();
+  const rows = await db
+    .select()
+    .from(knowledgeRecordLinks)
+    .where(
+      and(
+        eq(knowledgeRecordLinks.ownerId, params.ownerId ?? "global"),
+        eq(knowledgeRecordLinks.chatId, params.chatId),
+        or(
+          params.branchId === null
+            ? isNull(knowledgeRecordLinks.branchId)
+            : eq(knowledgeRecordLinks.branchId, params.branchId),
+          isNull(knowledgeRecordLinks.branchId)
+        )
+      )
+    );
+  return rows.map(rowToKnowledgeRecordLinkDto);
+}
diff --git a/server/src/services/chat-knowledge/knowledge-records-repository.ts b/server/src/services/chat-knowledge/knowledge-records-repository.ts
new file mode 100644
index 00000000..cba5669f
--- /dev/null
+++ b/server/src/services/chat-knowledge/knowledge-records-repository.ts
@@ -0,0 +1,229 @@
+import { randomUUID as uuidv4 } from "node:crypto";
+
+import { and, eq, inArray, isNull, or } from "drizzle-orm";
+
+import { initDb } from "../../db/client";
+import { knowledgeRecords } from "../../db/schema";
+
+import {
+  buildKnowledgeSearchText,
+  encodeJson,
+  rowToKnowledgeRecordDto,
+} from "./knowledge-helpers";
+
+import type {
+  KnowledgeAccessMode,
+  KnowledgeGatePolicy,
+  KnowledgeLayer,
+  KnowledgeOrigin,
+  KnowledgeRecordDto,
+  KnowledgeRecordStatus,
+} from "@shared/types/chat-knowledge";
+
+function buildOverlayBranchScope(branchId: string | null) {
+  return branchId === null
+    ? isNull(knowledgeRecords.branchId)
+    : or(isNull(knowledgeRecords.branchId), eq(knowledgeRecords.branchId, branchId));
+}
+
+function buildExactBranchScope(branchId: string | null) {
+  return branchId === null
+    ? isNull(knowledgeRecords.branchId)
+    : eq(knowledgeRecords.branchId, branchId);
+}
+
+export async function getKnowledgeRecordById(
+  id: string
+): Promise<KnowledgeRecordDto | null> {
+  const db = await initDb();
+  const rows = await db.select().from(knowledgeRecords).where(eq(knowledgeRecords.id, id)).limit(1);
+  return rows[0] ? rowToKnowledgeRecordDto(rows[0]) : null;
+}
+
+export async function getKnowledgeRecordsByIds(ids: string[]): Promise<KnowledgeRecordDto[]> {
+  if (ids.length === 0) return [];
+  const db = await initDb();
+  const rows = await db.select().from(knowledgeRecords).where(inArray(knowledgeRecords.id, ids));
+  return rows.map(rowToKnowledgeRecordDto);
+}
+
+export async function getScopedKnowledgeRecordsByIds(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  ids: string[];
+}): Promise<KnowledgeRecordDto[]> {
+  if (params.ids.length === 0) return [];
+  const db = await initDb();
+  const rows = await db
+    .select()
+    .from(knowledgeRecords)
+    .where(
+      and(
+        eq(knowledgeRecords.ownerId, params.ownerId ?? "global"),
+        eq(knowledgeRecords.chatId, params.chatId),
+        buildOverlayBranchScope(params.branchId),
+        inArray(knowledgeRecords.id, params.ids)
+      )
+    );
+  return rows.map(rowToKnowledgeRecordDto);
+}
+
+export async function findKnowledgeRecordsByKeys(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  keys: string[];
+}): Promise<KnowledgeRecordDto[]> {
+  if (params.keys.length === 0) return [];
+  const db = await initDb();
+  const rows = await db
+    .select()
+    .from(knowledgeRecords)
+    .where(
+      and(
+        eq(knowledgeRecords.ownerId, params.ownerId ?? "global"),
+        eq(knowledgeRecords.chatId, params.chatId),
+        buildOverlayBranchScope(params.branchId),
+        inArray(knowledgeRecords.key, params.keys)
+      )
+    );
+  return rows.map(rowToKnowledgeRecordDto);
+}
+
+export async function listKnowledgeRecords(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  collectionId?: string;
+  includeArchived?: boolean;
+}): Promise<KnowledgeRecordDto[]> {
+  const db = await initDb();
+  const where = [
+    eq(knowledgeRecords.ownerId, params.ownerId ?? "global"),
+    eq(knowledgeRecords.chatId, params.chatId),
+    buildOverlayBranchScope(params.branchId),
+  ];
+  if (params.collectionId) where.push(eq(knowledgeRecords.collectionId, params.collectionId));
+  if (!params.includeArchived) where.push(eq(knowledgeRecords.status, "active"));
+  const rows = await db.select().from(knowledgeRecords).where(and(...where));
+  return rows.map(rowToKnowledgeRecordDto);
+}
+
+export async function upsertKnowledgeRecord(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  collectionId: string;
+  recordType: string;
+  key: string;
+  title: string;
+  aliases: string[];
+  tags: string[];
+  summary?: string | null;
+  content: unknown;
+  accessMode: KnowledgeAccessMode;
+  origin: KnowledgeOrigin;
+  layer: KnowledgeLayer;
+  derivedFromRecordId?: string | null;
+  sourceMessageId?: string | null;
+  sourceOperationId?: string | null;
+  status?: KnowledgeRecordStatus;
+  gatePolicy?: KnowledgeGatePolicy | null;
+  meta?: unknown;
+}): Promise<KnowledgeRecordDto> {
+  const db = await initDb();
+  const now = new Date();
+  const searchText = buildKnowledgeSearchText({
+    title: params.title,
+    aliases: params.aliases,
+    tags: params.tags,
+    summary: params.summary ?? null,
+    content: params.content,
+    accessMode: params.accessMode,
+  });
+  const rows = await db
+    .select()
+    .from(knowledgeRecords)
+    .where(
+      and(
+        eq(knowledgeRecords.chatId, params.chatId),
+        buildExactBranchScope(params.branchId),
+        eq(knowledgeRecords.collectionId, params.collectionId),
+        eq(knowledgeRecords.key, params.key)
+      )
+    )
+    .limit(1);
+  const current = rows[0];
+
+  if (current) {
+    await db
+      .update(knowledgeRecords)
+      .set({
+        recordType: params.recordType,
+        title: params.title,
+        aliasesJson: encodeJson(params.aliases, "[]"),
+        tagsJson: encodeJson(params.tags, "[]"),
+        summary: params.summary ?? null,
+        contentJson: encodeJson(params.content, "null"),
+        searchText,
+        accessMode: params.accessMode,
+        origin: params.origin,
+        layer: params.layer,
+        derivedFromRecordId: params.derivedFromRecordId ?? null,
+        sourceMessageId: params.sourceMessageId ?? null,
+        sourceOperationId: params.sourceOperationId ?? null,
+        status: params.status ?? "active",
+        gatePolicyJson:
+          typeof params.gatePolicy === "undefined" ? null : encodeJson(params.gatePolicy, "null"),
+        metaJson: typeof params.meta === "undefined" ? null : encodeJson(params.meta, "null"),
+        updatedAt: now,
+      })
+      .where(eq(knowledgeRecords.id, current.id));
+  } else {
+    await db.insert(knowledgeRecords).values({
+      id: uuidv4(),
+      ownerId: params.ownerId ?? "global",
+      chatId: params.chatId,
+      branchId: params.branchId,
+      collectionId: params.collectionId,
+      recordType: params.recordType,
+      key: params.key,
+      title: params.title,
+      aliasesJson: encodeJson(params.aliases, "[]"),
+      tagsJson: encodeJson(params.tags, "[]"),
+      summary: params.summary ?? null,
+      contentJson: encodeJson(params.content, "null"),
+      searchText,
+      accessMode: params.accessMode,
+      origin: params.origin,
+      layer: params.layer,
+      derivedFromRecordId: params.derivedFromRecordId ?? null,
+      sourceMessageId: params.sourceMessageId ?? null,
+      sourceOperationId: params.sourceOperationId ?? null,
+      status: params.status ?? "active",
+      gatePolicyJson:
+        typeof params.gatePolicy === "undefined" ? null : encodeJson(params.gatePolicy, "null"),
+      metaJson: typeof params.meta === "undefined" ? null : encodeJson(params.meta, "null"),
+      createdAt: now,
+      updatedAt: now,
+    });
+  }
+
+  const reloadedRows = await db
+    .select()
+    .from(knowledgeRecords)
+    .where(
+      and(
+        eq(knowledgeRecords.chatId, params.chatId),
+        buildExactBranchScope(params.branchId),
+        eq(knowledgeRecords.collectionId, params.collectionId),
+        eq(knowledgeRecords.key, params.key)
+      )
+    )
+    .limit(1);
+  if (!reloadedRows[0]) {
+    throw new Error("Failed to upsert knowledge record");
+  }
+  return rowToKnowledgeRecordDto(reloadedRows[0]);
+}
diff --git a/server/src/services/chat-knowledge/knowledge-reveal-service.ts b/server/src/services/chat-knowledge/knowledge-reveal-service.ts
new file mode 100644
index 00000000..26ad5126
--- /dev/null
+++ b/server/src/services/chat-knowledge/knowledge-reveal-service.ts
@@ -0,0 +1,123 @@
+import { getKnowledgeRecordAccessState, upsertKnowledgeAccessState } from "./knowledge-access-repository";
+import { evaluateKnowledgeGate } from "./knowledge-gate-policy";
+import {
+  findKnowledgeRecordsByKeys,
+  getScopedKnowledgeRecordsByIds,
+} from "./knowledge-records-repository";
+
+import type {
+  KnowledgeRecordDto,
+  KnowledgeRevealRequest,
+  KnowledgeRevealResult,
+} from "@shared/types/chat-knowledge";
+
+async function resolveTargetRecords(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  request: KnowledgeRevealRequest;
+}): Promise<KnowledgeRecordDto[]> {
+  const byId = await getScopedKnowledgeRecordsByIds({
+    ownerId: params.ownerId,
+    chatId: params.chatId,
+    branchId: params.branchId,
+    ids: params.request.recordIds ?? [],
+  });
+  const byKey = await findKnowledgeRecordsByKeys({
+    ownerId: params.ownerId,
+    chatId: params.chatId,
+    branchId: params.branchId,
+    keys: params.request.recordKeys ?? [],
+  });
+  const seen = new Set<string>();
+  return [...byId, ...byKey].filter((item) => {
+    if (seen.has(item.id)) return false;
+    seen.add(item.id);
+    return true;
+  });
+}
+
+async function canRevealRecord(params: {
+  ownerId: string;
+  chatId: string;
+  branchId: string | null;
+  record: KnowledgeRecordDto;
+  request: KnowledgeRevealRequest;
+}): Promise<boolean> {
+  const gate = params.record.gatePolicy?.read ?? params.record.gatePolicy?.prompt;
+  if (!gate) return true;
+  return evaluateKnowledgeGate({
+    record: params.record,
+    gate,
+    ownerId: params.ownerId,
+    chatId: params.chatId,
+    branchId: params.branchId,
+    context: params.request.context,
+  });
+}
+
+export async function revealKnowledgeRecords(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  request: KnowledgeRevealRequest;
+}): Promise<KnowledgeRevealResult> {
+  const ownerId = params.ownerId ?? "global";
+  const targetRecords = await resolveTargetRecords(params);
+  const targetIds = new Set(targetRecords.map((item) => item.id));
+  const missingIds = (params.request.recordIds ?? []).filter((item) => !targetIds.has(item));
+
+  const results: KnowledgeRevealResult["results"] = [];
+  for (const missing of missingIds) {
+    results.push({
+      recordId: missing,
+      status: "not_found",
+      reason: "record_not_found",
+    });
+  }
+
+  for (const record of targetRecords) {
+    const allowed = await canRevealRecord({
+      ownerId,
+      chatId: params.chatId,
+      branchId: params.branchId,
+      record,
+      request: params.request,
+    });
+    if (!allowed) {
+      results.push({
+        recordId: record.id,
+        status: "blocked",
+        reason: "gate_policy_blocked",
+      });
+      continue;
+    }
+    const current = await getKnowledgeRecordAccessState({
+      ownerId,
+      chatId: params.chatId,
+      branchId: params.branchId,
+      recordId: record.id,
+    });
+    await upsertKnowledgeAccessState({
+      ownerId,
+      chatId: params.chatId,
+      branchId: params.branchId,
+      recordId: record.id,
+      discoverState: "visible",
+      readState: "full",
+      promptState: "allowed",
+      revealState: "revealed",
+      revealedAt: new Date(),
+      revealedBy: params.request.revealedBy ?? current?.revealedBy ?? "system",
+      revealReason: params.request.reason ?? current?.revealReason ?? null,
+      flags: current?.flags ?? {},
+    });
+    results.push({
+      recordId: record.id,
+      status: "revealed",
+      reason: current?.revealReason ?? null,
+    });
+  }
+
+  return { results };
+}
diff --git a/server/src/services/chat-knowledge/knowledge-search-service.ts b/server/src/services/chat-knowledge/knowledge-search-service.ts
new file mode 100644
index 00000000..9ea133c4
--- /dev/null
+++ b/server/src/services/chat-knowledge/knowledge-search-service.ts
@@ -0,0 +1,202 @@
+import { and, eq, inArray, isNull, or, sql } from "drizzle-orm";
+
+import { initDb } from "../../db/client";
+import { knowledgeRecords } from "../../db/schema";
+
+import { getKnowledgeRecordAccessState } from "./knowledge-access-repository";
+import { getDefaultAccessSnapshot } from "./knowledge-gate-policy";
+import { rowToKnowledgeRecordDto } from "./knowledge-helpers";
+
+import type {
+  KnowledgeRecordDto,
+  KnowledgeSearchHit,
+  KnowledgeSearchRequest,
+  KnowledgeSearchResult,
+} from "@shared/types/chat-knowledge";
+
+function buildBranchScope(branchId: string | null) {
+  return branchId === null
+    ? isNull(knowledgeRecords.branchId)
+    : or(isNull(knowledgeRecords.branchId), eq(knowledgeRecords.branchId, branchId));
+}
+
+function normalizeTokens(input: string | undefined): string[] {
+  if (!input) return [];
+  return Array.from(new Set((input.toLowerCase().match(/[\p{L}\p{N}_]+/gu) ?? []).filter(Boolean)));
+}
+
+function normalizeFtsQuery(tokens: string[]): string {
+  return tokens.map((token) => `${token.replace(/"/g, "")}*`).join(" OR ");
+}
+
+function countTokenMatches(record: KnowledgeRecordDto, tokens: string[]): number {
+  if (tokens.length === 0) return 0;
+  const haystack = `${record.title} ${record.aliases.join(" ")} ${record.tags.join(" ")} ${
+    record.summary ?? ""
+  } ${record.searchText}`.toLowerCase();
+  return tokens.filter((token) => haystack.includes(token)).length;
+}
+
+function buildMatchReasons(params: {
+  record: KnowledgeRecordDto;
+  request: KnowledgeSearchRequest;
+  textScore: number;
+}): string[] {
+  const reasons: string[] = [];
+  if (params.request.keys?.includes(params.record.key)) reasons.push("key_exact");
+  if (
+    params.request.titles?.some((item) => item.toLowerCase() === params.record.title.toLowerCase())
+  ) {
+    reasons.push("title_exact");
+  }
+  if (
+    params.request.aliases?.some((item) =>
+      params.record.aliases.some((alias) => alias.toLowerCase() === item.toLowerCase())
+    )
+  ) {
+    reasons.push("alias_exact");
+  }
+  if (
+    params.request.tags?.some((item) =>
+      params.record.tags.some((tag) => tag.toLowerCase() === item.toLowerCase())
+    )
+  ) {
+    reasons.push("tag_match");
+  }
+  if (params.textScore > 0) reasons.push("fts");
+  return reasons;
+}
+
+function buildPreview(record: KnowledgeRecordDto) {
+  return {
+    title: record.title,
+    summary: record.summary,
+    aliases: record.aliases,
+    tags: record.tags,
+    recordType: record.recordType,
+  };
+}
+
+async function getFtsScores(params: {
+  ids: string[];
+  textQuery?: string;
+}): Promise<Map<string, number>> {
+  if (params.ids.length === 0 || !params.textQuery?.trim()) return new Map();
+  const db = await initDb();
+  const tokens = normalizeTokens(params.textQuery);
+  if (tokens.length === 0) return new Map();
+  const idsSql = params.ids.map((id) => `'${id.replace(/'/g, "''")}'`).join(",");
+  const raw = await db.all<{ record_id: string; rank: number }>(sql.raw(`
+    SELECT record_id, bm25(knowledge_records_fts) AS rank
+    FROM knowledge_records_fts
+    WHERE knowledge_records_fts MATCH '${normalizeFtsQuery(tokens).replace(/'/g, "''")}'
+      AND record_id IN (${idsSql})
+  `));
+  const out = new Map<string, number>();
+  for (const row of raw) {
+    out.set(row.record_id, row.rank < 0 ? Math.abs(row.rank) : row.rank);
+  }
+  return out;
+}
+
+function computeExactScore(params: {
+  record: KnowledgeRecordDto;
+  request: KnowledgeSearchRequest;
+}): number {
+  let score = 0;
+  if (params.request.keys?.includes(params.record.key)) score += 120;
+  if (
+    params.request.titles?.some((item) => item.toLowerCase() === params.record.title.toLowerCase())
+  ) {
+    score += 100;
+  }
+  if (
+    params.request.aliases?.some((item) =>
+      params.record.aliases.some((alias) => alias.toLowerCase() === item.toLowerCase())
+    )
+  ) {
+    score += 80;
+  }
+  const tagMatches =
+    params.request.tags?.filter((item) =>
+      params.record.tags.some((tag) => tag.toLowerCase() === item.toLowerCase())
+    ).length ?? 0;
+  score += tagMatches * 20;
+  return score;
+}
+
+export async function searchKnowledgeRecords(params: {
+  ownerId?: string;
+  chatId: string;
+  branchId: string | null;
+  request: KnowledgeSearchRequest;
+}): Promise<KnowledgeSearchResult> {
+  const db = await initDb();
+  const where = [
+    eq(knowledgeRecords.ownerId, params.ownerId ?? "global"),
+    eq(knowledgeRecords.chatId, params.chatId),
+    buildBranchScope(params.branchId),
+    eq(knowledgeRecords.status, "active"),
+  ];
+  if (!params.request.includeHiddenCandidates) {
+    where.push(inArray(knowledgeRecords.accessMode, ["public", "discoverable"]));
+  }
+  if (params.request.collectionIds?.length) {
+    where.push(inArray(knowledgeRecords.collectionId, params.request.collectionIds));
+  }
+  if (params.request.recordTypes?.length) {
+    where.push(inArray(knowledgeRecords.recordType, params.request.recordTypes));
+  }
+  const rows = await db.select().from(knowledgeRecords).where(and(...where));
+  const records = rows.map(rowToKnowledgeRecordDto);
+  const ftsScores = await getFtsScores({
+    ids: records.map((item) => item.id),
+    textQuery: params.request.textQuery,
+  });
+  const tokens = normalizeTokens(params.request.textQuery);
+  const hits: KnowledgeSearchHit[] = [];
+
+  for (const record of records) {
+    if (record.accessMode === "internal") continue;
+    const defaultAccess = getDefaultAccessSnapshot(record.accessMode);
+    const accessState =
+      (await getKnowledgeRecordAccessState({
+        ownerId: params.ownerId,
+        chatId: params.chatId,
+        branchId: params.branchId,
+        recordId: record.id,
+      })) ?? null;
+    const matchedTokens = countTokenMatches(record, tokens);
+    const minimumShouldMatch = Math.max(0, params.request.minimumShouldMatch ?? 0);
+    if (minimumShouldMatch > 0 && matchedTokens < minimumShouldMatch) continue;
+
+    const exactScore = computeExactScore({ record, request: params.request });
+    const textScore = ftsScores.has(record.id)
+      ? Math.max(0, 30 - Math.min(30, ftsScores.get(record.id)!))
+      : 0;
+    const score = exactScore + textScore + matchedTokens * 2;
+    if (score <= 0 && tokens.length > 0) continue;
+    if (typeof params.request.minScore === "number" && score < params.request.minScore) continue;
+
+    const visibility =
+      accessState?.readState === "full" || defaultAccess.readState === "full" ? "full" : "preview";
+
+    hits.push({
+      recordId: record.id,
+      score,
+      matchReasons: buildMatchReasons({ record, request: params.request, textScore }),
+      visibility,
+      preview: buildPreview(record),
+      record: visibility === "full" ? record : null,
+    });
+  }
+
+  hits.sort((a, b) => {
+    if (b.score !== a.score) return b.score - a.score;
+    return a.recordId.localeCompare(b.recordId);
+  });
+
+  return {
+    hits: hits.slice(0, Math.max(1, Math.min(200, params.request.limit ?? 10))),
+  };
+}
diff --git a/server/src/services/operations/knowledge-operation-params.test.ts b/server/src/services/operations/knowledge-operation-params.test.ts
new file mode 100644
index 00000000..077a233f
--- /dev/null
+++ b/server/src/services/operations/knowledge-operation-params.test.ts
@@ -0,0 +1,49 @@
+import { describe, expect, test } from "vitest";
+
+import { parseKnowledgeRevealOperationParams, parseKnowledgeSearchOperationParams } from "./knowledge-operation-params";
+
+describe("knowledge operation params", () => {
+  test("parses inline knowledge search source", () => {
+    const parsed = parseKnowledgeSearchOperationParams({
+      source: {
+        mode: "inline",
+        requestTemplate: "{\"textQuery\":\"forest\",\"limit\":5}",
+      },
+    });
+
+    expect(parsed).toEqual({
+      source: {
+        mode: "inline",
+        requestTemplate: "{\"textQuery\":\"forest\",\"limit\":5}",
+        strictVariables: false,
+      },
+    });
+  });
+
+  test("parses artifact knowledge reveal source", () => {
+    const parsed = parseKnowledgeRevealOperationParams({
+      source: {
+        mode: "artifact",
+        artifactTag: "planner_result",
+      },
+    });
+
+    expect(parsed).toEqual({
+      source: {
+        mode: "artifact",
+        artifactTag: "planner_result",
+      },
+    });
+  });
+
+  test("rejects invalid artifact tag", () => {
+    expect(() =>
+      parseKnowledgeSearchOperationParams({
+        source: {
+          mode: "artifact",
+          artifactTag: "bad tag",
+        },
+      })
+    ).toThrow(/artifactTag/i);
+  });
+});
diff --git a/server/src/services/operations/knowledge-operation-params.ts b/server/src/services/operations/knowledge-operation-params.ts
new file mode 100644
index 00000000..b90a1b00
--- /dev/null
+++ b/server/src/services/operations/knowledge-operation-params.ts
@@ -0,0 +1,50 @@
+import { z } from "zod";
+
+import type {
+  KnowledgeRevealOperationParams,
+  KnowledgeSearchOperationParams,
+  KnowledgeRequestSource,
+} from "@shared/types/chat-knowledge";
+
+const artifactTagSchema = z
+  .string()
+  .trim()
+  .min(1)
+  .regex(/^[a-z][a-z0-9_]*$/, "artifactTag must match ^[a-z][a-z0-9_]*$");
+
+const requestSourceSchema: z.ZodType<KnowledgeRequestSource> = z.discriminatedUnion("mode", [
+  z
+    .object({
+      mode: z.literal("inline"),
+      requestTemplate: z.string().min(1),
+      strictVariables: z.boolean().optional(),
+    })
+    .transform((value) => ({
+      ...value,
+      strictVariables: value.strictVariables === true,
+    })),
+  z.object({
+    mode: z.literal("artifact"),
+    artifactTag: artifactTagSchema,
+  }),
+]);
+
+const searchParamsSchema: z.ZodType<KnowledgeSearchOperationParams> = z.object({
+  source: requestSourceSchema,
+});
+
+const revealParamsSchema: z.ZodType<KnowledgeRevealOperationParams> = z.object({
+  source: requestSourceSchema,
+});
+
+export function parseKnowledgeSearchOperationParams(
+  raw: unknown
+): KnowledgeSearchOperationParams {
+  return searchParamsSchema.parse(raw);
+}
+
+export function parseKnowledgeRevealOperationParams(
+  raw: unknown
+): KnowledgeRevealOperationParams {
+  return revealParamsSchema.parse(raw);
+}
diff --git a/server/src/services/operations/operation-block-validator.ts b/server/src/services/operations/operation-block-validator.ts
index f2888f86..5bf4425f 100644
--- a/server/src/services/operations/operation-block-validator.ts
+++ b/server/src/services/operations/operation-block-validator.ts
@@ -29,9 +29,18 @@ import {
   liquidGuardParamsSchema,
 } from "./guard-operation-params";
 import { compileGuardOutputSchema } from "./guard-output-contract";
+import {
+  parseKnowledgeRevealOperationParams,
+  parseKnowledgeSearchOperationParams,
+} from "./knowledge-operation-params";
 import { compileLlmJsonSchemaSpec } from "./llm-json-schema-spec";
 import { llmOperationParamsSchema } from "./llm-operation-params";
 
+import type {
+  KnowledgeRevealOperationParams,
+  KnowledgeSearchOperationParams,
+} from "@shared/types/chat-knowledge";
+
 const uuidSchema = z.string().uuid();
 
 const operationHookSchema = z.enum(["before_main_llm", "after_main_llm"] satisfies OperationHook[]);
@@ -222,6 +231,38 @@ const operationConfigOtherSchema = operationConfigBaseSchema.extend({
   params: otherKindParamsSchema,
 });
 
+const knowledgeRequestSourceSchema = z.discriminatedUnion("mode", [
+  z.object({
+    mode: z.literal("inline"),
+    requestTemplate: z.string().min(1),
+    strictVariables: z.boolean().optional(),
+  }),
+  z.object({
+    mode: z.literal("artifact"),
+    artifactTag: artifactTagSchema,
+  }),
+]);
+
+const operationConfigKnowledgeSearchSchema = operationConfigBaseSchema.extend({
+  params: z.object({
+    params: z.object({
+      source: knowledgeRequestSourceSchema,
+    }),
+    artifact: artifactConfigSchema.optional(),
+    output: legacyOperationOutputSchema.optional(),
+  }),
+});
+
+const operationConfigKnowledgeRevealSchema = operationConfigBaseSchema.extend({
+  params: z.object({
+    params: z.object({
+      source: knowledgeRequestSourceSchema,
+    }),
+    artifact: artifactConfigSchema.optional(),
+    output: legacyOperationOutputSchema.optional(),
+  }),
+});
+
 const operationConfigLlmSchema = operationConfigBaseSchema.extend({
   params: z.object({
     params: llmOperationParamsSchema,
@@ -264,6 +305,20 @@ export const operationInProfileSchema: z.ZodType<OperationInProfile> = z
       kind: z.literal("guard"),
       config: operationConfigGuardSchema,
     }),
+    z.object({
+      opId: uuidSchema,
+      name: z.string().trim().min(1),
+      description: z.string().trim().min(1).optional(),
+      kind: z.literal("knowledge_search"),
+      config: operationConfigKnowledgeSearchSchema,
+    }),
+    z.object({
+      opId: uuidSchema,
+      name: z.string().trim().min(1),
+      description: z.string().trim().min(1).optional(),
+      kind: z.literal("knowledge_reveal"),
+      config: operationConfigKnowledgeRevealSchema,
+    }),
     z.object({
       opId: uuidSchema,
       name: z.string().trim().min(1),
@@ -273,7 +328,10 @@ export const operationInProfileSchema: z.ZodType<OperationInProfile> = z
         "tool",
         "compute",
         "transform",
-      ] satisfies Exclude<OperationKind, "template" | "llm" | "guard">[]),
+      ] satisfies Exclude<
+        OperationKind,
+        "template" | "llm" | "guard" | "knowledge_search" | "knowledge_reveal"
+      >[]),
       config: operationConfigOtherSchema,
     }),
   ])
@@ -667,6 +725,38 @@ function validateCrossRules(input: ValidatedOperationBlockInput): void {
       }
     }
 
+    if (op.kind === "knowledge_search" || op.kind === "knowledge_reveal") {
+      const parser:
+        | ((raw: unknown) => KnowledgeSearchOperationParams)
+        | ((raw: unknown) => KnowledgeRevealOperationParams) =
+        op.kind === "knowledge_search"
+          ? parseKnowledgeSearchOperationParams
+          : parseKnowledgeRevealOperationParams;
+      const knowledgeParams = parser(op.config.params.params);
+
+      if (op.config.params.artifact.format !== "json") {
+        throw new HttpError(
+          400,
+          `${op.kind} artifact format must be json`,
+          "VALIDATION_ERROR",
+          { opId: op.opId }
+        );
+      }
+
+      if (knowledgeParams.source.mode === "inline") {
+        try {
+          validateLiquidTemplate(knowledgeParams.source.requestTemplate);
+        } catch (error) {
+          throw new HttpError(
+            400,
+            `${op.kind} template не компилируется: ${error instanceof Error ? error.message : String(error)}`,
+            "VALIDATION_ERROR",
+            { opId: op.opId }
+          );
+        }
+      }
+    }
+
     const existingArtifactId = artifactIds.get(op.config.params.artifact.artifactId);
     if (existingArtifactId) {
       throw new HttpError(400, "Duplicate artifactId in block", "VALIDATION_ERROR", {
diff --git a/shared/types/chat-knowledge.ts b/shared/types/chat-knowledge.ts
new file mode 100644
index 00000000..96ec81d6
--- /dev/null
+++ b/shared/types/chat-knowledge.ts
@@ -0,0 +1,262 @@
+export const knowledgeScopes = ["chat", "branch"] as const;
+export type KnowledgeScope = (typeof knowledgeScopes)[number];
+
+export const knowledgeCollectionStatuses = ["active", "archived", "deleted"] as const;
+export type KnowledgeCollectionStatus = (typeof knowledgeCollectionStatuses)[number];
+
+export const knowledgeRecordStatuses = ["active", "archived", "deleted"] as const;
+export type KnowledgeRecordStatus = (typeof knowledgeRecordStatuses)[number];
+
+export const knowledgeOrigins = ["import", "author", "system_seed", "user", "llm"] as const;
+export type KnowledgeOrigin = (typeof knowledgeOrigins)[number];
+
+export const knowledgeLayers = ["baseline", "runtime"] as const;
+export type KnowledgeLayer = (typeof knowledgeLayers)[number];
+
+export const knowledgeAccessModes = ["public", "discoverable", "hidden", "internal"] as const;
+export type KnowledgeAccessMode = (typeof knowledgeAccessModes)[number];
+
+export const knowledgeDiscoverStates = ["hidden", "discoverable", "visible"] as const;
+export type KnowledgeDiscoverState = (typeof knowledgeDiscoverStates)[number];
+
+export const knowledgeReadStates = ["blocked", "partial", "full"] as const;
+export type KnowledgeReadState = (typeof knowledgeReadStates)[number];
+
+export const knowledgePromptStates = ["blocked", "allowed"] as const;
+export type KnowledgePromptState = (typeof knowledgePromptStates)[number];
+
+export const knowledgeRevealStates = ["hidden", "revealed"] as const;
+export type KnowledgeRevealState = (typeof knowledgeRevealStates)[number];
+
+export const knowledgeRevealActors = ["system", "user", "llm", "import"] as const;
+export type KnowledgeRevealActor = (typeof knowledgeRevealActors)[number];
+
+export const knowledgeExportModes = [
+  "baseline_only",
+  "runtime_only",
+  "baseline_plus_runtime",
+  "baseline_with_reveals",
+] as const;
+export type KnowledgeExportMode = (typeof knowledgeExportModes)[number];
+
+export type KnowledgeGatePredicate =
+  | {
+      type: "flag_equals";
+      key: string;
+      value: unknown;
+    }
+  | {
+      type: "record_revealed";
+      recordId?: string;
+      recordKey?: string;
+    }
+  | {
+      type: "record_state";
+      recordId?: string;
+      recordKey?: string;
+      revealState?: KnowledgeRevealState;
+      readState?: KnowledgeReadState;
+      promptState?: KnowledgePromptState;
+    }
+  | {
+      type: "counter_gte";
+      key: string;
+      value: number;
+    }
+  | {
+      type: "manual_unlock";
+    }
+  | {
+      type: "branch_only";
+      branchId?: string;
+    };
+
+export type KnowledgeGateExpression =
+  | {
+      all: KnowledgeGateNode[];
+    }
+  | {
+      any: KnowledgeGateNode[];
+    }
+  | {
+      not: KnowledgeGateNode;
+    };
+
+export type KnowledgeGateNode = KnowledgeGatePredicate | KnowledgeGateExpression;
+
+export type KnowledgeGatePolicy = {
+  discover?: { mode?: "always" } | KnowledgeGateExpression;
+  read?: KnowledgeGateExpression;
+  prompt?: KnowledgeGateExpression;
+};
+
+export type KnowledgeCollectionDto = {
+  id: string;
+  ownerId: string;
+  chatId: string;
+  branchId: string | null;
+  scope: KnowledgeScope;
+  name: string;
+  kind: string | null;
+  description: string | null;
+  status: KnowledgeCollectionStatus;
+  origin: KnowledgeOrigin;
+  layer: KnowledgeLayer;
+  meta: unknown | null;
+  createdAt: Date;
+  updatedAt: Date;
+};
+
+export type KnowledgeRecordDto = {
+  id: string;
+  ownerId: string;
+  chatId: string;
+  branchId: string | null;
+  collectionId: string;
+  recordType: string;
+  key: string;
+  title: string;
+  aliases: string[];
+  tags: string[];
+  summary: string | null;
+  content: unknown;
+  searchText: string;
+  accessMode: KnowledgeAccessMode;
+  origin: KnowledgeOrigin;
+  layer: KnowledgeLayer;
+  derivedFromRecordId: string | null;
+  sourceMessageId: string | null;
+  sourceOperationId: string | null;
+  status: KnowledgeRecordStatus;
+  gatePolicy: KnowledgeGatePolicy | null;
+  meta: unknown | null;
+  createdAt: Date;
+  updatedAt: Date;
+};
+
+export type KnowledgeRecordLinkDto = {
+  id: string;
+  ownerId: string;
+  chatId: string;
+  branchId: string | null;
+  fromRecordId: string;
+  relationType: string;
+  toRecordId: string;
+  meta: unknown | null;
+  createdAt: Date;
+  updatedAt: Date;
+};
+
+export type KnowledgeRecordAccessStateDto = {
+  id: string;
+  ownerId: string;
+  chatId: string;
+  branchId: string | null;
+  recordId: string;
+  discoverState: KnowledgeDiscoverState;
+  readState: KnowledgeReadState;
+  promptState: KnowledgePromptState;
+  revealState: KnowledgeRevealState;
+  revealedAt: Date | null;
+  revealedBy: KnowledgeRevealActor | null;
+  revealReason: string | null;
+  flags: Record<string, unknown>;
+  updatedAt: Date;
+};
+
+export type KnowledgeRuntimeContext = {
+  flags?: Record<string, unknown>;
+  counters?: Record<string, number>;
+  manualUnlock?: boolean;
+};
+
+export type KnowledgeSearchRequest = {
+  textQuery?: string;
+  keys?: string[];
+  titles?: string[];
+  aliases?: string[];
+  tags?: string[];
+  recordTypes?: string[];
+  collectionIds?: string[];
+  includeHiddenCandidates?: boolean;
+  limit?: number;
+  minScore?: number;
+  minimumShouldMatch?: number;
+  context?: KnowledgeRuntimeContext;
+};
+
+export type KnowledgeRecordPreview = {
+  title: string;
+  summary: string | null;
+  aliases: string[];
+  tags: string[];
+  recordType: string;
+};
+
+export type KnowledgeSearchHit = {
+  recordId: string;
+  score: number;
+  matchReasons: string[];
+  visibility: "preview" | "full";
+  preview: KnowledgeRecordPreview;
+  record: KnowledgeRecordDto | null;
+};
+
+export type KnowledgeSearchResult = {
+  hits: KnowledgeSearchHit[];
+};
+
+export type KnowledgeRevealRequest = {
+  recordIds?: string[];
+  recordKeys?: string[];
+  reason?: string;
+  revealedBy?: KnowledgeRevealActor;
+  context?: KnowledgeRuntimeContext;
+};
+
+export type KnowledgeRevealItemResult = {
+  recordId: string;
+  status: "revealed" | "blocked" | "not_found";
+  reason: string | null;
+};
+
+export type KnowledgeRevealResult = {
+  results: KnowledgeRevealItemResult[];
+};
+
+export type KnowledgeCollectionExportPayload = {
+  version: 1;
+  collection: Omit<KnowledgeCollectionDto, "id" | "createdAt" | "updatedAt"> & {
+    sourceCollectionId?: string;
+  };
+  records: KnowledgeRecordDto[];
+  links: KnowledgeRecordLinkDto[];
+  accessState: KnowledgeRecordAccessStateDto[];
+  mode: KnowledgeExportMode;
+};
+
+export type KnowledgeCollectionImportResult = {
+  collection: KnowledgeCollectionDto;
+  records: KnowledgeRecordDto[];
+  links: KnowledgeRecordLinkDto[];
+  accessState: KnowledgeRecordAccessStateDto[];
+};
+
+export type KnowledgeRequestSource =
+  | {
+      mode: "inline";
+      requestTemplate: string;
+      strictVariables?: boolean;
+    }
+  | {
+      mode: "artifact";
+      artifactTag: string;
+    };
+
+export type KnowledgeSearchOperationParams = {
+  source: KnowledgeRequestSource;
+};
+
+export type KnowledgeRevealOperationParams = {
+  source: KnowledgeRequestSource;
+};
diff --git a/shared/types/operation-profiles.ts b/shared/types/operation-profiles.ts
index c3c39428..22f9dc4a 100644
--- a/shared/types/operation-profiles.ts
+++ b/shared/types/operation-profiles.ts
@@ -1,3 +1,8 @@
+import type {
+  KnowledgeRevealOperationParams,
+  KnowledgeSearchOperationParams,
+} from "./chat-knowledge";
+
 export type OperationHook = "before_main_llm" | "after_main_llm";
 export type OperationTrigger = "generate" | "regenerate";
 
@@ -18,6 +23,8 @@ export type OperationKind =
   | "template"
   | "llm"
   | "guard"
+  | "knowledge_search"
+  | "knowledge_reveal"
   | "rag"
   | "tool"
   | "compute"
@@ -303,17 +310,38 @@ export type GuardOperationInProfile = {
   config: OperationConfig<GuardOperationParams>;
 };
 
+export type KnowledgeSearchOperationInProfile = {
+  opId: string;
+  name: string;
+  description?: string;
+  kind: "knowledge_search";
+  config: OperationConfig<OperationOtherKindParams<KnowledgeSearchOperationParams>>;
+};
+
+export type KnowledgeRevealOperationInProfile = {
+  opId: string;
+  name: string;
+  description?: string;
+  kind: "knowledge_reveal";
+  config: OperationConfig<OperationOtherKindParams<KnowledgeRevealOperationParams>>;
+};
+
 export type GenericNonTemplateOperationInProfile = {
   opId: string;
   name: string;
   description?: string;
-  kind: Exclude<OperationKind, "template" | "llm" | "guard">;
+  kind: Exclude<
+    OperationKind,
+    "template" | "llm" | "guard" | "knowledge_search" | "knowledge_reveal"
+  >;
   config: OperationConfig<OperationOtherKindParams>;
 };
 
 export type NonTemplateOperationInProfile =
   | LlmOperationInProfile
   | GuardOperationInProfile
+  | KnowledgeSearchOperationInProfile
+  | KnowledgeRevealOperationInProfile
   | GenericNonTemplateOperationInProfile;
 
 export type OperationInProfile = TemplateOperationInProfile | NonTemplateOperationInProfile;
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
index 022ae374..546f9385 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
@@ -491,7 +491,7 @@ export function fromOperationProfileForm(
 						},
 					},
 				},
-			};
+			} as OperationInProfile;
 		}),
 	};
 }

From 892bb96928a49e8c8daddb569e3fde938ea48b27 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 21 Mar 2026 23:43:50 +0300
Subject: [PATCH 31/54] feat: add knowledge operations to profile editor

---
 .../form/knowledge-kind-form.test.ts          |  39 ++++
 .../form/knowledge-kind-form.ts               | 125 +++++++++++
 .../operation-profile-form-mapping.test.ts    | 198 ++++++++++++++++++
 .../form/operation-profile-form-mapping.ts    |  48 ++++-
 .../ui/operation-editor/operation-editor.tsx  |  25 ++-
 .../kind-params/knowledge-kind-fields.tsx     |  74 +++++++
 .../knowledge-kind-section.test.ts            |  80 +++++++
 .../knowledge-reveal-kind-section.tsx         |  11 +
 .../knowledge-search-kind-section.tsx         |  11 +
 .../sections/output-section.tsx               |  13 +-
 .../sections/params-section.tsx               |   6 +
 .../utils/operation-kind.test.ts              |  10 +
 .../utils/operation-kind.ts                   |   4 +
 .../i18n/resources/en/operationProfiles.ts    |  21 ++
 .../i18n/resources/ru/operationProfiles.ts    |  21 ++
 15 files changed, 673 insertions(+), 13 deletions(-)
 create mode 100644 web/src/features/sidebars/operation-profiles/form/knowledge-kind-form.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/form/knowledge-kind-form.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-kind-fields.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-kind-section.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-reveal-kind-section.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-search-kind-section.tsx

diff --git a/web/src/features/sidebars/operation-profiles/form/knowledge-kind-form.test.ts b/web/src/features/sidebars/operation-profiles/form/knowledge-kind-form.test.ts
new file mode 100644
index 00000000..e29a7ead
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/form/knowledge-kind-form.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+	makeDefaultKnowledgeKindParams,
+	requiresJsonArtifactFormat,
+} from './knowledge-kind-form';
+
+describe('knowledge kind form', () => {
+	it('creates inline defaults for both knowledge operation kinds', () => {
+		const search = makeDefaultKnowledgeKindParams('knowledge-search-1', 'knowledge_search');
+		const reveal = makeDefaultKnowledgeKindParams('knowledge-reveal-1', 'knowledge_reveal');
+
+		expect(search).toMatchObject({
+			sourceMode: 'inline',
+			requestTemplate: '',
+			strictVariables: false,
+			artifactTag: '',
+			artifact: expect.objectContaining({
+				format: 'json',
+			}),
+		});
+		expect(reveal).toMatchObject({
+			sourceMode: 'inline',
+			requestTemplate: '',
+			strictVariables: false,
+			artifactTag: '',
+			artifact: expect.objectContaining({
+				format: 'json',
+			}),
+		});
+	});
+
+	it('requires json artifact format for guard and knowledge kinds', () => {
+		expect(requiresJsonArtifactFormat('guard')).toBe(true);
+		expect(requiresJsonArtifactFormat('knowledge_search')).toBe(true);
+		expect(requiresJsonArtifactFormat('knowledge_reveal')).toBe(true);
+		expect(requiresJsonArtifactFormat('template')).toBe(false);
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/form/knowledge-kind-form.ts b/web/src/features/sidebars/operation-profiles/form/knowledge-kind-form.ts
new file mode 100644
index 00000000..c3e61321
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/form/knowledge-kind-form.ts
@@ -0,0 +1,125 @@
+import {
+	buildOperationArtifactId,
+	makeDefaultOperationArtifactConfig,
+	normalizeOperationArtifactConfig,
+	type OperationArtifactConfig,
+	type OperationInProfile,
+	type OperationKind,
+	type OperationOtherKindParams,
+} from '@shared/types/operation-profiles';
+
+import type {
+	KnowledgeRequestSource,
+	KnowledgeRevealOperationParams,
+	KnowledgeSearchOperationParams,
+} from '@shared/types/chat-knowledge';
+
+export type KnowledgeOperationKind = 'knowledge_search' | 'knowledge_reveal';
+
+export type FormKnowledgeKindParams = {
+	sourceMode: KnowledgeRequestSource['mode'];
+	requestTemplate: string;
+	strictVariables: boolean;
+	artifactTag: string;
+	artifact: OperationArtifactConfig;
+};
+
+type KnowledgeOperationInProfile = Extract<
+	OperationInProfile,
+	{ kind: 'knowledge_search' | 'knowledge_reveal' }
+>;
+
+type KnowledgeOperationParams =
+	| OperationOtherKindParams<KnowledgeSearchOperationParams>
+	| OperationOtherKindParams<KnowledgeRevealOperationParams>;
+
+export function isKnowledgeOperationKind(value: unknown): value is KnowledgeOperationKind {
+	return value === 'knowledge_search' || value === 'knowledge_reveal';
+}
+
+export function requiresJsonArtifactFormat(kind: OperationKind): boolean {
+	return kind === 'guard' || isKnowledgeOperationKind(kind);
+}
+
+function forceJsonArtifactFormat(artifact: OperationArtifactConfig): OperationArtifactConfig {
+	return {
+		...artifact,
+		artifactId: artifact.artifactId || buildOperationArtifactId('temp-op'),
+		format: 'json',
+	};
+}
+
+export function makeDefaultKnowledgeKindParams(
+	opId: string,
+	kind: KnowledgeOperationKind,
+	artifact: OperationArtifactConfig = makeDefaultOperationArtifactConfig({
+		opId,
+		kind,
+		title: 'Artifact',
+	}),
+): FormKnowledgeKindParams {
+	return {
+		sourceMode: 'inline',
+		requestTemplate: '',
+		strictVariables: false,
+		artifactTag: '',
+		artifact: forceJsonArtifactFormat(artifact),
+	};
+}
+
+export function normalizeKnowledgeKindParams(op: KnowledgeOperationInProfile): FormKnowledgeKindParams {
+	const params = op.config.params as Record<string, unknown>;
+	const rawParams =
+		params.params && typeof params.params === 'object' && !Array.isArray(params.params)
+			? (params.params as Record<string, unknown>)
+			: {};
+	const rawSource =
+		rawParams.source && typeof rawParams.source === 'object' && !Array.isArray(rawParams.source)
+			? (rawParams.source as Record<string, unknown>)
+			: {};
+	const sourceMode = rawSource.mode === 'artifact' ? 'artifact' : 'inline';
+
+	return {
+		sourceMode,
+		requestTemplate:
+			sourceMode === 'inline' && typeof rawSource.requestTemplate === 'string' ? rawSource.requestTemplate : '',
+		strictVariables: sourceMode === 'inline' ? rawSource.strictVariables === true : false,
+		artifactTag:
+			sourceMode === 'artifact' && typeof rawSource.artifactTag === 'string' ? rawSource.artifactTag : '',
+		artifact: forceJsonArtifactFormat(
+			normalizeOperationArtifactConfig({
+				opId: op.opId,
+				kind: op.kind,
+				title: op.name,
+				rawParams: params,
+			}),
+		),
+	};
+}
+
+function buildKnowledgeRequestSource(params: FormKnowledgeKindParams): KnowledgeRequestSource {
+	if (params.sourceMode === 'artifact') {
+		return {
+			mode: 'artifact',
+			artifactTag: params.artifactTag.trim(),
+		};
+	}
+
+	return {
+		mode: 'inline',
+		requestTemplate: params.requestTemplate,
+		strictVariables: params.strictVariables ? true : undefined,
+	};
+}
+
+export function serializeKnowledgeKindParams(params: FormKnowledgeKindParams, opId: string): KnowledgeOperationParams {
+	return {
+		params: {
+			source: buildKnowledgeRequestSource(params),
+		},
+		artifact: forceJsonArtifactFormat({
+			...params.artifact,
+			artifactId: params.artifact.artifactId || buildOperationArtifactId(opId),
+		}),
+	};
+}
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
index 60bf7518..005c5741 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
@@ -308,4 +308,202 @@ describe('operation profile form mapping', () => {
 		});
 		expect((llm as { config: { params: { params: { samplers?: unknown } } } }).config.params.params.samplers).toBeUndefined();
 	});
+
+	it('normalizes knowledge operations into dedicated form params', () => {
+		const profile: OperationProfileDto = {
+			profileId: 'profile-knowledge',
+			ownerId: 'owner-1',
+			name: 'Profile',
+			description: undefined,
+			enabled: true,
+			executionMode: 'sequential',
+			operationProfileSessionId: 'session-knowledge',
+			blockRefs: [],
+			operations: [
+				{
+					opId: 'knowledge-search-1',
+					name: 'Knowledge Search',
+					kind: 'knowledge_search',
+					config: {
+						enabled: true,
+						required: false,
+						hooks: ['before_main_llm'],
+						triggers: ['generate'],
+						order: 10,
+						params: {
+							params: {
+								source: {
+									mode: 'inline',
+									requestTemplate: '{"textQuery":"forest","limit":5}',
+									strictVariables: true,
+								},
+							},
+							artifact: makeArtifact({
+								artifactId: 'artifact:knowledge-search-1',
+								tag: 'knowledge_search_result',
+								format: 'json',
+							}),
+						},
+					},
+				},
+				{
+					opId: 'knowledge-reveal-1',
+					name: 'Knowledge Reveal',
+					kind: 'knowledge_reveal',
+					config: {
+						enabled: true,
+						required: false,
+						hooks: ['before_main_llm'],
+						triggers: ['generate'],
+						order: 20,
+						params: {
+							params: {
+								source: {
+									mode: 'artifact',
+									artifactTag: 'planner_result',
+								},
+							},
+							artifact: makeArtifact({
+								artifactId: 'artifact:knowledge-reveal-1',
+								tag: 'knowledge_reveal_result',
+								format: 'json',
+							}),
+						},
+					},
+				},
+			],
+			meta: {},
+			version: 1,
+			createdAt: '2026-03-21T00:00:00.000Z',
+			updatedAt: '2026-03-21T00:00:00.000Z',
+		};
+
+		const form = toOperationProfileForm(profile);
+
+		expect(form.operations[0]).toMatchObject({
+			kind: 'knowledge_search',
+			config: {
+				params: {
+					sourceMode: 'inline',
+					requestTemplate: '{"textQuery":"forest","limit":5}',
+					strictVariables: true,
+					artifactTag: '',
+					artifact: expect.objectContaining({
+						format: 'json',
+					}),
+				},
+			},
+		});
+		expect(form.operations[1]).toMatchObject({
+			kind: 'knowledge_reveal',
+			config: {
+				params: {
+					sourceMode: 'artifact',
+					requestTemplate: '',
+					strictVariables: false,
+					artifactTag: 'planner_result',
+					artifact: expect.objectContaining({
+						format: 'json',
+					}),
+				},
+			},
+		});
+	});
+
+	it('serializes knowledge operations back to dto shape', () => {
+		const values: OperationProfileFormValues = {
+			name: 'Knowledge profile',
+			description: '',
+			enabled: true,
+			executionMode: 'concurrent',
+			operationProfileSessionId: 'session-knowledge',
+			operations: [
+				{
+					opId: 'knowledge-search-1',
+					name: 'Knowledge Search',
+					description: '',
+					kind: 'knowledge_search',
+					config: {
+						enabled: true,
+						required: false,
+						hooks: ['before_main_llm'],
+						triggers: ['generate', 'regenerate'],
+						activation: { everyNTurns: 0, everyNContextTokens: 0 },
+						order: 10,
+						dependsOn: [],
+						runConditions: [],
+						params: {
+							sourceMode: 'inline',
+							requestTemplate: '{"textQuery":"dark forest"}',
+							strictVariables: true,
+							artifactTag: '',
+							artifact: makeArtifact({
+								artifactId: 'artifact:knowledge-search-1',
+								tag: 'knowledge_search_result',
+								format: 'json',
+							}),
+						},
+					},
+				},
+				{
+					opId: 'knowledge-reveal-1',
+					name: 'Knowledge Reveal',
+					description: '',
+					kind: 'knowledge_reveal',
+					config: {
+						enabled: true,
+						required: false,
+						hooks: ['before_main_llm'],
+						triggers: ['generate'],
+						activation: { everyNTurns: 0, everyNContextTokens: 0 },
+						order: 20,
+						dependsOn: ['knowledge-search-1'],
+						runConditions: [],
+						params: {
+							sourceMode: 'artifact',
+							requestTemplate: '',
+							strictVariables: false,
+							artifactTag: 'planner_result',
+							artifact: makeArtifact({
+								artifactId: 'artifact:knowledge-reveal-1',
+								tag: 'knowledge_reveal_result',
+								format: 'json',
+							}),
+						},
+					},
+				},
+			],
+		};
+
+		const result = fromOperationProfileForm(values, { validateJson: true });
+
+		expect(result.operations[0]).toMatchObject({
+			kind: 'knowledge_search',
+			config: {
+				params: {
+					params: {
+						source: {
+							mode: 'inline',
+							requestTemplate: '{"textQuery":"dark forest"}',
+							strictVariables: true,
+						},
+					},
+				},
+			},
+		});
+		expect(result.operations[1]).toMatchObject({
+			kind: 'knowledge_reveal',
+			config: {
+				dependsOn: ['knowledge-search-1'],
+				params: {
+					params: {
+						source: {
+							mode: 'artifact',
+							artifactTag: 'planner_result',
+						},
+					},
+				},
+			},
+		});
+	});
 });
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
index 546f9385..b198e7b9 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
@@ -16,6 +16,11 @@ import {
 	serializeGuardKindParams,
 	type FormGuardKindParams,
 } from './guard-kind-form';
+import {
+	normalizeKnowledgeKindParams,
+	serializeKnowledgeKindParams,
+	type FormKnowledgeKindParams,
+} from './knowledge-kind-form';
 import {
 	normalizeRetryOn,
 	pickNumericSamplers,
@@ -73,7 +78,12 @@ export type FormOperation = {
 		order: number;
 		dependsOn: string[];
 		runConditions: FormRunCondition[];
-		params: FormTemplateParams | FormLlmKindParams | FormGuardKindParams | FormOtherKindParams;
+		params:
+			| FormTemplateParams
+			| FormLlmKindParams
+			| FormGuardKindParams
+			| FormKnowledgeKindParams
+			| FormOtherKindParams;
 	};
 };
 
@@ -127,7 +137,7 @@ export function makeDefaultLlmKindParams(
 
 export function makeDefaultOtherKindParams(
 	opId: string,
-	kind: Exclude<OperationKind, 'template' | 'llm' | 'guard'>,
+	kind: Exclude<OperationKind, 'template' | 'llm' | 'guard' | 'knowledge_search' | 'knowledge_reveal'>,
 	artifact: OperationArtifactConfig = makeDefaultArtifactOutput(opId, kind),
 ): FormOtherKindParams {
 	return {
@@ -296,6 +306,8 @@ export function toOperationProfileForm(profile: OperationProfileDto): OperationP
 							? normalizeGuardKindParams(op)
 						: op.kind === 'llm'
 							? normalizeLlmKindParams(op)
+							: op.kind === 'knowledge_search' || op.kind === 'knowledge_reveal'
+								? normalizeKnowledgeKindParams(op)
 							: normalizeOtherKindParams(op),
 			},
 		})),
@@ -379,6 +391,27 @@ export function fromOperationProfileForm(
 				};
 			}
 
+			if (op.kind === 'knowledge_search' || op.kind === 'knowledge_reveal') {
+				const params = op.config.params as FormKnowledgeKindParams;
+				return {
+					opId: op.opId,
+					name: op.name,
+					description: op.description.trim() ? op.description.trim() : undefined,
+					kind: op.kind,
+					config: {
+						enabled: Boolean(op.config.enabled),
+						required: Boolean(op.config.required),
+						hooks: op.config.hooks,
+						triggers: op.config.triggers,
+						activation,
+						order: Number(op.config.order),
+						dependsOn: op.config.dependsOn?.length ? op.config.dependsOn : undefined,
+						runConditions,
+						params: serializeKnowledgeKindParams(params, op.opId),
+					},
+				} as OperationInProfile;
+			}
+
 			if (op.kind === 'llm') {
 				const params = op.config.params as FormLlmKindParams;
 				const model = params.model.trim();
@@ -473,7 +506,10 @@ export function fromOperationProfileForm(
 				opId: op.opId,
 				name: op.name,
 				description: op.description.trim() ? op.description.trim() : undefined,
-				kind: op.kind as Exclude<OperationKind, 'template' | 'llm' | 'guard'>,
+				kind: op.kind as Exclude<
+					OperationKind,
+					'template' | 'llm' | 'guard' | 'knowledge_search' | 'knowledge_reveal'
+				>,
 				config: {
 					enabled: Boolean(op.config.enabled),
 					required: Boolean(op.config.required),
@@ -517,9 +553,9 @@ export function makeDefaultOperation(): FormOperation {
 				runConditions: [],
 				params: {
 					template: '',
-				strictVariables: false,
-				artifact: makeDefaultArtifactOutput(opId, 'template'),
-			},
+					strictVariables: false,
+					artifact: makeDefaultArtifactOutput(opId, 'template'),
+				},
 		},
 	};
 }
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
index 050c8342..4785369d 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/operation-editor.tsx
@@ -9,6 +9,12 @@ import { IconButtonWithTooltip } from '@ui/icon-button-with-tooltip';
 import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
 
 import { makeDefaultGuardKindParams, type FormGuardKindParams } from '../../form/guard-kind-form';
+import {
+	isKnowledgeOperationKind,
+	makeDefaultKnowledgeKindParams,
+	requiresJsonArtifactFormat,
+	type FormKnowledgeKindParams,
+} from '../../form/knowledge-kind-form';
 import {
 	makeDefaultArtifactOutput,
 	makeDefaultLlmKindParams,
@@ -46,7 +52,9 @@ function resolveArtifactForKind(opId: string, kind: OperationKind, currentValue:
 	return {
 		...fallback,
 		...(currentValue as OperationArtifactConfig),
-		format: kind === 'guard' ? 'json' : ((currentValue as OperationArtifactConfig).format ?? fallback.format),
+		format: requiresJsonArtifactFormat(kind)
+			? 'json'
+			: ((currentValue as OperationArtifactConfig).format ?? fallback.format),
 	};
 }
 
@@ -148,9 +156,22 @@ export const OperationEditor: React.FC<Props> = memo(({ index, title, status, ca
 							return;
 						}
 
+						if (isKnowledgeOperationKind(nextKind)) {
+							const nextParams: FormKnowledgeKindParams = makeDefaultKnowledgeKindParams(
+								safeOpId || 'temp-op',
+								nextKind,
+								safeArtifact,
+							);
+							setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
+							return;
+						}
+
 						const nextParams: FormOtherKindParams = makeDefaultOtherKindParams(
 							safeOpId || 'temp-op',
-							nextKind as Exclude<OperationKind, 'template' | 'llm' | 'guard'>,
+							nextKind as Exclude<
+								OperationKind,
+								'template' | 'llm' | 'guard' | 'knowledge_search' | 'knowledge_reveal'
+							>,
 							safeArtifact,
 						);
 						setValue(`operations.${index}.config.params`, nextParams, { shouldDirty: true });
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-kind-fields.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-kind-fields.tsx
new file mode 100644
index 00000000..a759df3d
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-kind-fields.tsx
@@ -0,0 +1,74 @@
+import { Stack, Text } from '@mantine/core';
+import React from 'react';
+import { useFormContext, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+
+import { FormCheckbox, FormInput, FormSelect, FormTextarea } from '@ui/form-components';
+
+import type { KnowledgeOperationKind } from '../../../../form/knowledge-kind-form';
+import type { OperationProfileFormValues } from '../../../../form/operation-profile-form-mapping';
+
+type Props = {
+	index: number;
+	kind: KnowledgeOperationKind;
+};
+
+export const KnowledgeKindFields: React.FC<Props> = ({ index, kind }) => {
+	const { t } = useTranslation();
+	const { control } = useFormContext<OperationProfileFormValues>();
+	const sourceMode = useWatch({
+		control,
+		name: `operations.${index}.config.params.sourceMode`,
+	}) as unknown;
+	const normalizedSourceMode = sourceMode === 'artifact' ? 'artifact' : 'inline';
+
+	return (
+		<Stack gap="xs">
+			<Text size="sm" c="dimmed">
+				{t(`operationProfiles.kindSection.${kind}.description`)}
+			</Text>
+
+			<FormSelect
+				name={`operations.${index}.config.params.sourceMode`}
+				label={t('operationProfiles.kindSection.knowledge.sourceMode')}
+				infoTip={t('operationProfiles.kindSection.knowledge.sourceModeInfo')}
+				selectProps={{
+					options: [
+						{
+							value: 'inline',
+							label: t('operationProfiles.kindSection.knowledge.sourceModeInline'),
+						},
+						{
+							value: 'artifact',
+							label: t('operationProfiles.kindSection.knowledge.sourceModeArtifact'),
+						},
+					],
+					comboboxProps: { withinPortal: false },
+				}}
+			/>
+
+			{normalizedSourceMode === 'inline' ? (
+				<>
+					<FormCheckbox
+						name={`operations.${index}.config.params.strictVariables`}
+						label={t('operationProfiles.kindSection.knowledge.strictVariables')}
+						infoTip={t('operationProfiles.kindSection.knowledge.strictVariablesInfo')}
+					/>
+					<FormTextarea
+						name={`operations.${index}.config.params.requestTemplate`}
+						label={t(`operationProfiles.kindSection.${kind}.requestTemplate`)}
+						infoTip={t('operationProfiles.kindSection.knowledge.requestTemplateInfo')}
+						liquidDocsContext="operation_template"
+						textareaProps={{ minRows: 8, maxRows: 20, autosize: false }}
+					/>
+				</>
+			) : (
+				<FormInput
+					name={`operations.${index}.config.params.artifactTag`}
+					label={t('operationProfiles.kindSection.knowledge.artifactTag')}
+					infoTip={t('operationProfiles.kindSection.knowledge.artifactTagInfo')}
+				/>
+			)}
+		</Stack>
+	);
+};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-kind-section.test.ts b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-kind-section.test.ts
new file mode 100644
index 00000000..b284d1ab
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-kind-section.test.ts
@@ -0,0 +1,80 @@
+import { MantineProvider } from '@mantine/core';
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { FormProvider, useForm, type FormProviderProps } from 'react-hook-form';
+import { describe, expect, it } from 'vitest';
+
+import '../../../../../../../i18n';
+import { KnowledgeRevealKindSection } from './knowledge-reveal-kind-section';
+import { KnowledgeSearchKindSection } from './knowledge-search-kind-section';
+
+import type { ReactNode } from 'react';
+
+function renderWithForm(children: ReactNode, values: Record<string, unknown>): string {
+	function Wrapper() {
+		const methods = useForm({
+			defaultValues: values,
+		});
+		const providerProps: FormProviderProps<Record<string, unknown>> = {
+			...methods,
+			children,
+		};
+		return React.createElement(
+			MantineProvider,
+			{},
+			React.createElement(FormProvider, providerProps),
+		);
+	}
+
+	return renderToStaticMarkup(React.createElement(Wrapper));
+}
+
+describe('knowledge kind sections', () => {
+	it('renders inline fields for search section', () => {
+		const markup = renderWithForm(
+			React.createElement(KnowledgeSearchKindSection, { index: 0 }),
+			{
+				operations: [
+					{
+						config: {
+							params: {
+								sourceMode: 'inline',
+								requestTemplate: '',
+								strictVariables: false,
+								artifactTag: '',
+							},
+						},
+					},
+				],
+			},
+		);
+
+		expect(markup).toContain('Режим источника');
+		expect(markup).toContain('Шаблон search request');
+		expect(markup).toContain('Строгие переменные');
+	});
+
+	it('renders artifact tag field for reveal section in artifact mode', () => {
+		const markup = renderWithForm(
+			React.createElement(KnowledgeRevealKindSection, { index: 0 }),
+			{
+				operations: [
+					{
+						config: {
+							params: {
+								sourceMode: 'artifact',
+								requestTemplate: '',
+								strictVariables: false,
+								artifactTag: 'planner_result',
+							},
+						},
+					},
+				],
+			},
+		);
+
+		expect(markup).toContain('Режим источника');
+		expect(markup).toContain('Тег артефакта запроса');
+		expect(markup).not.toContain('Шаблон reveal request');
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-reveal-kind-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-reveal-kind-section.tsx
new file mode 100644
index 00000000..a1c8d210
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-reveal-kind-section.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import { KnowledgeKindFields } from './knowledge-kind-fields';
+
+type Props = {
+	index: number;
+};
+
+export const KnowledgeRevealKindSection: React.FC<Props> = ({ index }) => {
+	return <KnowledgeKindFields index={index} kind="knowledge_reveal" />;
+};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-search-kind-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-search-kind-section.tsx
new file mode 100644
index 00000000..8e2a46fd
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/kind-params/knowledge-search-kind-section.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import { KnowledgeKindFields } from './knowledge-kind-fields';
+
+type Props = {
+	index: number;
+};
+
+export const KnowledgeSearchKindSection: React.FC<Props> = ({ index }) => {
+	return <KnowledgeKindFields index={index} kind="knowledge_search" />;
+};
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
index 3ffac9da..85b3c25b 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/output-section.tsx
@@ -5,6 +5,9 @@ import { useTranslation } from 'react-i18next';
 
 import { FormCheckbox, FormInput, FormNumberInput, FormSelect } from '@ui/form-components';
 
+import { requiresJsonArtifactFormat } from '../../../form/knowledge-kind-form';
+import { isOperationKind } from '../../../utils/operation-kind';
+
 import type { ArtifactExposure } from '@shared/types/operation-profiles';
 
 const formatOptions = ['text', 'markdown', 'json'] as const;
@@ -71,7 +74,7 @@ export const OutputSection: React.FC<Props> = ({ index }) => {
 		  }
 		| undefined;
 	const kindValue = useWatch({ control, name: `operations.${index}.kind` }) as unknown;
-	const isGuardKind = kindValue === 'guard';
+	const isJsonLockedKind = isOperationKind(kindValue) ? requiresJsonArtifactFormat(kindValue) : false;
 
 	const exposuresArray = useFieldArray({
 		control,
@@ -79,9 +82,9 @@ export const OutputSection: React.FC<Props> = ({ index }) => {
 	});
 
 	useEffect(() => {
-		if (!isGuardKind || artifact?.format === 'json') return;
+		if (!isJsonLockedKind || artifact?.format === 'json') return;
 		setValue(`operations.${index}.config.params.artifact.format`, 'json', { shouldDirty: true });
-	}, [artifact?.format, index, isGuardKind, setValue]);
+	}, [artifact?.format, index, isJsonLockedKind, setValue]);
 
 	return (
 		<Stack gap="md">
@@ -113,12 +116,12 @@ export const OutputSection: React.FC<Props> = ({ index }) => {
 					label={t('operationProfiles.sectionsLabels.format')}
 					infoTip={t('operationProfiles.tooltips.format')}
 					selectProps={{
-						options: (isGuardKind ? ['json'] : formatOptions).map((value) => ({
+						options: (isJsonLockedKind ? ['json'] : formatOptions).map((value) => ({
 							value,
 							label: t(`operationProfiles.valueLabel.${value}`),
 						})),
 						comboboxProps: { withinPortal: false },
-						disabled: isGuardKind,
+						disabled: isJsonLockedKind,
 					}}
 				/>
 			</Group>
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx
index 6d018b46..2f7a567e 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-editor/sections/params-section.tsx
@@ -2,6 +2,8 @@ import React from 'react';
 
 import { ComputeKindSection } from './kind-params/compute-kind-section';
 import { GuardKindSection } from './kind-params/guard-kind-section';
+import { KnowledgeRevealKindSection } from './kind-params/knowledge-reveal-kind-section';
+import { KnowledgeSearchKindSection } from './kind-params/knowledge-search-kind-section';
 import { LlmKindSection } from './kind-params/llm-kind-section';
 import { RagKindSection } from './kind-params/rag-kind-section';
 import { TemplateKindSection } from './kind-params/template-kind-section';
@@ -23,6 +25,10 @@ export const ParamsSection: React.FC<Props> = ({ index, kind }) => {
 			return <LlmKindSection index={index} />;
 		case 'guard':
 			return <GuardKindSection index={index} />;
+		case 'knowledge_search':
+			return <KnowledgeSearchKindSection index={index} />;
+		case 'knowledge_reveal':
+			return <KnowledgeRevealKindSection index={index} />;
 		case 'rag':
 			return <RagKindSection index={index} />;
 		case 'tool':
diff --git a/web/src/features/sidebars/operation-profiles/utils/operation-kind.test.ts b/web/src/features/sidebars/operation-profiles/utils/operation-kind.test.ts
index 490bbfb8..53325138 100644
--- a/web/src/features/sidebars/operation-profiles/utils/operation-kind.test.ts
+++ b/web/src/features/sidebars/operation-profiles/utils/operation-kind.test.ts
@@ -7,7 +7,17 @@ describe('operation-kind', () => {
 		expect(OPERATION_KIND_OPTIONS).not.toContain('legacy');
 	});
 
+	it('exposes knowledge operation kinds in options', () => {
+		expect(OPERATION_KIND_OPTIONS).toContain('knowledge_search');
+		expect(OPERATION_KIND_OPTIONS).toContain('knowledge_reveal');
+	});
+
 	it('does not accept legacy as an operation kind', () => {
 		expect(isOperationKind('legacy')).toBe(false);
 	});
+
+	it('accepts knowledge operation kinds', () => {
+		expect(isOperationKind('knowledge_search')).toBe(true);
+		expect(isOperationKind('knowledge_reveal')).toBe(true);
+	});
 });
diff --git a/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts b/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts
index 52439b25..21c77802 100644
--- a/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts
+++ b/web/src/features/sidebars/operation-profiles/utils/operation-kind.ts
@@ -4,6 +4,8 @@ export const OPERATION_KIND_OPTIONS = [
 	'template',
 	'llm',
 	'guard',
+	'knowledge_search',
+	'knowledge_reveal',
 	'rag',
 	'tool',
 	'compute',
@@ -15,6 +17,8 @@ export function isOperationKind(value: unknown): value is OperationKind {
 		value === 'template' ||
 		value === 'llm' ||
 		value === 'guard' ||
+		value === 'knowledge_search' ||
+		value === 'knowledge_reveal' ||
 		value === 'rag' ||
 		value === 'tool' ||
 		value === 'compute' ||
diff --git a/web/src/i18n/resources/en/operationProfiles.ts b/web/src/i18n/resources/en/operationProfiles.ts
index 4bee4859..789040f8 100644
--- a/web/src/i18n/resources/en/operationProfiles.ts
+++ b/web/src/i18n/resources/en/operationProfiles.ts
@@ -215,6 +215,8 @@ const enOperationProfiles = {
 				template: 'Template',
 				llm: 'LLM',
 				guard: 'Guard',
+				knowledge_search: 'Knowledge Search',
+				knowledge_reveal: 'Knowledge Reveal',
 				rag: 'RAG',
 				tool: 'Tool',
 				compute: 'Compute',
@@ -223,6 +225,17 @@ const enOperationProfiles = {
 			kindSection: {
 				jsonParamsLabel: '{{kindLabel}} params (JSON)',
 				jsonParamsInfo: 'Kind parameters are stored as JSON object in config.params.params.',
+				knowledge: {
+					sourceMode: 'Source mode',
+					sourceModeInfo: 'Choose inline JSON template or request JSON loaded from an artifact.',
+					sourceModeInline: 'Inline template',
+					sourceModeArtifact: 'Artifact',
+					requestTemplateInfo: 'Template must render a valid JSON request for the knowledge operation.',
+					artifactTag: 'Request artifact tag',
+					artifactTagInfo: 'Artifact tag that contains the JSON request payload.',
+					strictVariables: 'Strict variables',
+					strictVariablesInfo: 'When enabled, inline template fails on unknown Liquid variables.',
+				},
 				template: {
 					description: 'Template operations render text from available variables and pass result to output effects.',
 					strictVariables: 'Strict variables',
@@ -323,6 +336,14 @@ const enOperationProfiles = {
 					retryOn: 'Retry on',
 					retryOnInfo: 'Error classes allowed to trigger a retry for aux LLM guard execution.',
 				},
+				knowledge_search: {
+					description: 'Configure the source of the search request for explicit retrieval from the chat knowledge store.',
+					requestTemplate: 'Search request template',
+				},
+				knowledge_reveal: {
+					description: 'Configure the source of the reveal request for controlled knowledge record reveals.',
+					requestTemplate: 'Reveal request template',
+				},
 				rag: {
 					description: 'Configure retrieval source and ranking parameters for context assembly.',
 				},
diff --git a/web/src/i18n/resources/ru/operationProfiles.ts b/web/src/i18n/resources/ru/operationProfiles.ts
index ea3fbc56..1a2fdb6f 100644
--- a/web/src/i18n/resources/ru/operationProfiles.ts
+++ b/web/src/i18n/resources/ru/operationProfiles.ts
@@ -216,6 +216,8 @@ const ruOperationProfiles = {
 				template: 'Шаблон',
 				llm: 'LLM',
 				guard: 'Guard',
+				knowledge_search: 'Knowledge Search',
+				knowledge_reveal: 'Knowledge Reveal',
 				rag: 'RAG',
 				tool: 'Инструмент',
 				compute: 'Вычисление',
@@ -224,6 +226,17 @@ const ruOperationProfiles = {
 			kindSection: {
 				jsonParamsLabel: '{{kindLabel}} params (JSON)',
 				jsonParamsInfo: 'Параметры типа сохраняются как JSON-объект в config.params.params.',
+				knowledge: {
+					sourceMode: 'Режим источника',
+					sourceModeInfo: 'Выберите inline JSON template или ссылку на JSON request из артефакта.',
+					sourceModeInline: 'Inline template',
+					sourceModeArtifact: 'Артефакт',
+					requestTemplateInfo: 'Шаблон должен отрендерить корректный JSON request для knowledge operation.',
+					artifactTag: 'Тег артефакта запроса',
+					artifactTagInfo: 'Тег артефакта, из которого будет прочитан JSON request.',
+					strictVariables: 'Строгие переменные',
+					strictVariablesInfo: 'Если включено, inline template падает при неизвестных Liquid-переменных.',
+				},
 				template: {
 					description: 'Template-операции рендерят текст из доступных переменных и передают результат в output effects.',
 					strictVariables: 'Строгие переменные',
@@ -324,6 +337,14 @@ const ruOperationProfiles = {
 					retryOn: 'Повторять при',
 					retryOnInfo: 'Классы ошибок, при которых aux LLM guard может быть перезапущен.',
 				},
+				knowledge_search: {
+					description: 'Настройте источник search request для явного поиска знаний в chat knowledge store.',
+					requestTemplate: 'Шаблон search request',
+				},
+				knowledge_reveal: {
+					description: 'Настройте источник reveal request для контролируемого открытия knowledge records.',
+					requestTemplate: 'Шаблон reveal request',
+				},
 				rag: {
 					description: 'Настройте источник retrieval и параметры ранжирования для сборки контекста.',
 				},

From a5c75e566f78d3f130c57e08005d3f9b7e96684c Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Tue, 31 Mar 2026 23:49:41 +0300
Subject: [PATCH 32/54] feat: add drag-and-drop reordering for instruction
 blocks

---
 .../instructions/instruction-editor.tsx       | 216 ++----------
 .../instructions/prompt-order.test.ts         |  44 +++
 .../sidebars/instructions/prompt-order.ts     |  31 ++
 .../instructions/st-prompt-block-list.tsx     | 331 ++++++++++++++++++
 web/src/i18n/resources/en/instructions.ts     |   4 +
 web/src/i18n/resources/ru/instructions.ts     |   4 +
 6 files changed, 435 insertions(+), 195 deletions(-)
 create mode 100644 web/src/features/sidebars/instructions/prompt-order.test.ts
 create mode 100644 web/src/features/sidebars/instructions/prompt-order.ts
 create mode 100644 web/src/features/sidebars/instructions/st-prompt-block-list.tsx

diff --git a/web/src/features/sidebars/instructions/instruction-editor.tsx b/web/src/features/sidebars/instructions/instruction-editor.tsx
index b9a92c06..c1a279da 100644
--- a/web/src/features/sidebars/instructions/instruction-editor.tsx
+++ b/web/src/features/sidebars/instructions/instruction-editor.tsx
@@ -1,17 +1,15 @@
-import { Accordion, Alert, Button, Collapse, Group, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
+import { Accordion, Button, Collapse, Group, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
 import { isValidSillyTavernPromptIdentifier } from '@shared/utils/sillytavern-preset';
 import { useUnit } from 'effector-react';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuArrowDown, LuArrowUp, LuChevronDown, LuChevronRight, LuPlus, LuTrash2 } from 'react-icons/lu';
+import { LuPlus } from 'react-icons/lu';
 
 import { $currentBranchId, $currentChat, $currentEntityProfile } from '@model/chat-core';
 import { $selectedInstruction, instructionEditorDraftChanged } from '@model/instructions';
 import {
 	createEmptyStBaseConfig,
 	getStPromptDefinition,
-	getStPromptSourceLabel,
-	isSystemMarkerPrompt,
 	resolvePreferredPromptOrder,
 	ST_SYSTEM_PROMPT_DEFAULTS,
 } from '@model/instructions/st-preset';
@@ -19,6 +17,8 @@ import { LiquidDocsButton } from '@ui/liquid-template-docs';
 
 import { prerenderInstruction } from '../../../api/instructions';
 
+import { StPromptBlockList } from './st-prompt-block-list';
+
 import type { StBaseConfig, StBasePrompt } from '@shared/types/instructions';
 
 type CustomPromptDraft = {
@@ -56,17 +56,6 @@ function createEmptyCustomPromptDraft(): CustomPromptDraft {
 	};
 }
 
-function isCustomPrompt(identifier: string): boolean {
-	return !STANDARD_PROMPT_IDENTIFIERS.includes(identifier);
-}
-
-function formatPromptMeta(prompt: StBasePrompt, t: (key: string) => string): string {
-	const parts: string[] = [prompt.role ?? 'system'];
-	if (prompt.system_prompt) parts.push('system_prompt');
-	if (prompt.marker) parts.push(t('instructions.fields.markerLabel'));
-	return parts.join(' · ');
-}
-
 export const InstructionEditor = () => {
 	const { t } = useTranslation();
 	const instruction = useUnit($selectedInstruction);
@@ -408,8 +397,13 @@ export const InstructionEditor = () => {
 
 			{instruction.kind === 'st_base' && stBase && preferredOrder && (
 				<Stack gap="sm">
-					<Group justify="space-between" align="center">
-						<Text fw={600}>{t('instructions.fields.promptBlocks')}</Text>
+					<Group justify="space-between" align="flex-start">
+						<Stack gap={2}>
+							<Text fw={600}>{t('instructions.fields.promptBlocks')}</Text>
+							<Text size="xs" c="dimmed">
+								{t('instructions.fields.reorderBlocksHint')}
+							</Text>
+						</Stack>
 						<Button
 							size="sm"
 							variant={addBlockOpened ? 'default' : 'light'}
@@ -539,184 +533,16 @@ export const InstructionEditor = () => {
 						</Stack>
 					</Collapse>
 
-					{preferredOrder.order.map((entry, index) => {
-						const prompt = normalizePromptForEdit(promptMap.get(entry.identifier), entry.identifier);
-						const sourceLabel = getStPromptSourceLabel(entry.identifier);
-						const standardPrompt = !isCustomPrompt(entry.identifier);
-						const runtimeManagedMarker = isSystemMarkerPrompt(prompt) && Boolean(sourceLabel);
-						const collapsibleMarker = runtimeManagedMarker || prompt.marker === true;
-						const isCollapsed = isPromptCollapsed(entry.identifier, collapsibleMarker);
-
-						return (
-							<Stack key={`${entry.identifier}_${index}`} gap={6} p="xs" style={{ border: '1px solid var(--mantine-color-gray-3)', borderRadius: 8 }}>
-								<Group justify="space-between" align="center">
-									<Group gap="xs" align="center">
-										<Button
-											size="compact-sm"
-											variant="subtle"
-											px={4}
-											onClick={() => togglePromptCollapsed(entry.identifier, collapsibleMarker)}
-											aria-label={isCollapsed ? 'Expand block' : 'Collapse block'}
-										>
-											{isCollapsed ? <LuChevronRight size={16} /> : <LuChevronDown size={16} />}
-										</Button>
-										<Switch
-											checked={entry.enabled}
-											onChange={(event) => {
-												const enabled = event.currentTarget.checked;
-												updatePreferredOrder((order) =>
-													order.map((item, itemIndex) =>
-														itemIndex === index ? { ...item, enabled } : item
-													)
-												);
-											}}
-											size="sm"
-										/>
-										<Stack gap={0}>
-											<Text size="sm" fw={500}>
-												{prompt.name || entry.identifier}
-											</Text>
-											<Text size="xs" c="dimmed">
-												{entry.identifier}
-											</Text>
-										</Stack>
-									</Group>
-									<Group gap={4}>
-										<Button
-											size="compact-sm"
-											variant="subtle"
-											leftSection={<LuArrowUp size={14} />}
-											disabled={index === 0}
-											onClick={() => {
-												updatePreferredOrder((order) => {
-													if (index === 0) return order;
-													const next = [...order];
-													[next[index - 1], next[index]] = [next[index], next[index - 1]];
-													return next;
-												});
-											}}
-										>
-											{t('common.up')}
-										</Button>
-										<Button
-											size="compact-sm"
-											variant="subtle"
-											leftSection={<LuArrowDown size={14} />}
-											disabled={index === preferredOrder.order.length - 1}
-											onClick={() => {
-												updatePreferredOrder((order) => {
-													if (index >= order.length - 1) return order;
-													const next = [...order];
-													[next[index], next[index + 1]] = [next[index + 1], next[index]];
-													return next;
-												});
-											}}
-										>
-											{t('common.down')}
-										</Button>
-										<Button
-											size="compact-sm"
-											variant="subtle"
-											color="red"
-											leftSection={<LuTrash2 size={14} />}
-											onClick={() => removePrompt(entry.identifier, index)}
-										>
-											{t('common.delete')}
-										</Button>
-									</Group>
-								</Group>
-
-								<Collapse in={!isCollapsed}>
-									<Stack gap={8}>
-										<Text size="xs" c="dimmed">
-											{formatPromptMeta(prompt, t)}
-										</Text>
-
-										{isCustomPrompt(entry.identifier) && (
-											<Group grow align="flex-start">
-												<TextInput
-													label={t('instructions.fields.promptName')}
-													value={prompt.name ?? ''}
-													onChange={(event) =>
-														updateCustomPromptField(entry.identifier, {
-															name: event.currentTarget.value.trim() || undefined,
-														})
-													}
-												/>
-												<Select
-													label={t('instructions.fields.promptRole')}
-													value={prompt.role ?? 'system'}
-													onChange={(value) =>
-														updateCustomPromptField(entry.identifier, {
-															role: (value as StBasePrompt['role'] | null) ?? 'system',
-														})
-													}
-													data={[
-														{ value: 'system', label: 'system' },
-														{ value: 'user', label: 'user' },
-														{ value: 'assistant', label: 'assistant' },
-													]}
-													allowDeselect={false}
-												/>
-											</Group>
-										)}
-
-										{isCustomPrompt(entry.identifier) && (
-											<Group gap="lg">
-												<Switch
-													label="system_prompt"
-													checked={prompt.system_prompt === true}
-													onChange={(event) =>
-														updateCustomPromptField(entry.identifier, {
-															system_prompt: event.currentTarget.checked,
-														})
-													}
-												/>
-												<Switch
-													label={t('instructions.fields.markerLabel')}
-													checked={prompt.marker === true}
-													onChange={(event) =>
-														updateCustomPromptField(entry.identifier, {
-															marker: event.currentTarget.checked,
-														})
-													}
-												/>
-											</Group>
-										)}
-
-										{runtimeManagedMarker ? (
-											<Alert color="blue" variant="light" title={t('instructions.fields.systemBlockTitle')}>
-												<Stack gap={4}>
-													<Text size="sm">{t('instructions.fields.systemBlockDescription')}</Text>
-													{sourceLabel ? (
-														<Text size="sm">
-															{t('instructions.fields.systemBlockSource')}: {sourceLabel}
-														</Text>
-													) : null}
-												</Stack>
-											</Alert>
-										) : (
-											<Textarea
-												value={prompt.content ?? ''}
-												onChange={(event) => setPromptContent(entry.identifier, event.currentTarget.value)}
-												placeholder={t('instructions.placeholders.promptBlockContent')}
-												description={prompt.marker ? t('instructions.fields.markerDescription') : undefined}
-												minRows={4}
-												autosize
-												styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
-											/>
-										)}
-
-										{!standardPrompt && (
-											<Text size="xs" c="dimmed">
-												{t('instructions.fields.customBlockHint')}
-											</Text>
-										)}
-									</Stack>
-								</Collapse>
-							</Stack>
-						);
-					})}
+					<StPromptBlockList
+						entries={preferredOrder.order}
+						promptMap={promptMap}
+						isPromptCollapsed={isPromptCollapsed}
+						onTogglePromptCollapsed={togglePromptCollapsed}
+						onUpdatePreferredOrder={updatePreferredOrder}
+						onRemovePrompt={removePrompt}
+						onSetPromptContent={setPromptContent}
+						onUpdateCustomPromptField={updateCustomPromptField}
+					/>
 
 					<Accordion variant="separated">
 						<Accordion.Item value="details">
diff --git a/web/src/features/sidebars/instructions/prompt-order.test.ts b/web/src/features/sidebars/instructions/prompt-order.test.ts
new file mode 100644
index 00000000..1b63c9a1
--- /dev/null
+++ b/web/src/features/sidebars/instructions/prompt-order.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, it } from 'vitest';
+
+import { movePromptOrderItem } from './prompt-order';
+
+describe('movePromptOrderItem', () => {
+	it('moves a prompt block down to a later position', () => {
+		const initialOrder = [
+			{ identifier: 'main', enabled: true },
+			{ identifier: 'worldInfoBefore', enabled: false },
+			{ identifier: 'charDescription', enabled: true },
+		];
+
+		expect(movePromptOrderItem(initialOrder, 0, 2)).toEqual([
+			{ identifier: 'worldInfoBefore', enabled: false },
+			{ identifier: 'charDescription', enabled: true },
+			{ identifier: 'main', enabled: true },
+		]);
+	});
+
+	it('moves a prompt block up to an earlier position', () => {
+		const initialOrder = [
+			{ identifier: 'main', enabled: true },
+			{ identifier: 'worldInfoBefore', enabled: false },
+			{ identifier: 'charDescription', enabled: true },
+		];
+
+		expect(movePromptOrderItem(initialOrder, 2, 0)).toEqual([
+			{ identifier: 'charDescription', enabled: true },
+			{ identifier: 'main', enabled: true },
+			{ identifier: 'worldInfoBefore', enabled: false },
+		]);
+	});
+
+	it('returns the original order when indices do not produce a move', () => {
+		const initialOrder = [
+			{ identifier: 'main', enabled: true },
+			{ identifier: 'worldInfoBefore', enabled: false },
+		];
+
+		expect(movePromptOrderItem(initialOrder, -1, 1)).toEqual(initialOrder);
+		expect(movePromptOrderItem(initialOrder, 0, 0)).toEqual(initialOrder);
+		expect(movePromptOrderItem(initialOrder, 0, 10)).toEqual(initialOrder);
+	});
+});
diff --git a/web/src/features/sidebars/instructions/prompt-order.ts b/web/src/features/sidebars/instructions/prompt-order.ts
new file mode 100644
index 00000000..0a31573f
--- /dev/null
+++ b/web/src/features/sidebars/instructions/prompt-order.ts
@@ -0,0 +1,31 @@
+export type PromptOrderItem = {
+	identifier: string;
+	enabled: boolean;
+};
+
+export function movePromptOrderItem<T>(
+	items: readonly T[],
+	fromIndex: number,
+	toIndex: number,
+): T[] {
+	if (
+		!Number.isInteger(fromIndex) ||
+		!Number.isInteger(toIndex) ||
+		fromIndex < 0 ||
+		toIndex < 0 ||
+		fromIndex >= items.length ||
+		toIndex >= items.length ||
+		fromIndex === toIndex
+	) {
+		return [...items];
+	}
+
+	const nextItems = [...items];
+	const [movedItem] = nextItems.splice(fromIndex, 1);
+	if (typeof movedItem === 'undefined') {
+		return [...items];
+	}
+
+	nextItems.splice(toIndex, 0, movedItem);
+	return nextItems;
+}
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-list.tsx b/web/src/features/sidebars/instructions/st-prompt-block-list.tsx
new file mode 100644
index 00000000..756e910d
--- /dev/null
+++ b/web/src/features/sidebars/instructions/st-prompt-block-list.tsx
@@ -0,0 +1,331 @@
+import { ActionIcon, Alert, Collapse, Group, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
+import { useState, type DragEvent as ReactDragEvent, type KeyboardEvent as ReactKeyboardEvent } from 'react';
+import { useTranslation } from 'react-i18next';
+import { LuChevronDown, LuChevronRight, LuGripVertical, LuTrash2 } from 'react-icons/lu';
+
+import {
+	getStPromptDefinition,
+	getStPromptSourceLabel,
+	isSystemMarkerPrompt,
+	ST_SYSTEM_PROMPT_DEFAULTS,
+} from '@model/instructions/st-preset';
+
+import { movePromptOrderItem, type PromptOrderItem } from './prompt-order';
+
+import type { StBasePrompt } from '@shared/types/instructions';
+
+const STANDARD_PROMPT_IDENTIFIERS = new Set(ST_SYSTEM_PROMPT_DEFAULTS.map((item) => item.identifier));
+
+type StPromptBlockListProps = {
+	entries: PromptOrderItem[];
+	promptMap: Map<string, StBasePrompt>;
+	isPromptCollapsed: (identifier: string, isMarkerPrompt: boolean) => boolean;
+	onTogglePromptCollapsed: (identifier: string, isMarkerPrompt: boolean) => void;
+	onUpdatePreferredOrder: (updater: (order: PromptOrderItem[]) => PromptOrderItem[]) => void;
+	onRemovePrompt: (identifier: string, index: number) => void;
+	onSetPromptContent: (identifier: string, content: string) => void;
+	onUpdateCustomPromptField: (identifier: string, patch: Partial<StBasePrompt>) => void;
+};
+
+function normalizePromptForEdit(prompt: StBasePrompt | undefined, identifier: string): StBasePrompt {
+	if (prompt) return { ...prompt };
+
+	const definition = getStPromptDefinition(identifier);
+	if (definition) return { ...definition };
+
+	return {
+		identifier,
+		name: identifier,
+		role: 'system',
+		system_prompt: true,
+		content: '',
+	};
+}
+
+function isCustomPrompt(identifier: string): boolean {
+	return !STANDARD_PROMPT_IDENTIFIERS.has(identifier);
+}
+
+function formatPromptMeta(prompt: StBasePrompt, t: (key: string) => string): string {
+	const parts: string[] = [prompt.role ?? 'system'];
+	if (prompt.system_prompt) parts.push('system_prompt');
+	if (prompt.marker) parts.push(t('instructions.fields.markerLabel'));
+	return parts.join(' · ');
+}
+
+function resolveDropSlotIndex(event: ReactDragEvent<HTMLElement>, index: number): number {
+	const rect = event.currentTarget.getBoundingClientRect();
+	const insertBefore = event.clientY < rect.top + rect.height / 2;
+	return insertBefore ? index : index + 1;
+}
+
+function resolveDropTargetIndex(fromIndex: number, slotIndex: number): number {
+	return fromIndex < slotIndex ? slotIndex - 1 : slotIndex;
+}
+
+function createCardStyle(params: {
+	draggedIndex: number | null;
+	dropSlotIndex: number | null;
+	index: number;
+}) {
+	const dropBefore = params.dropSlotIndex === params.index;
+	const dropAfter = params.dropSlotIndex === params.index + 1;
+
+	return {
+		border: '1px solid var(--mantine-color-gray-3)',
+		borderRadius: 8,
+		boxShadow: [
+			dropBefore ? 'inset 0 3px 0 0 var(--mantine-color-blue-6)' : null,
+			dropAfter ? 'inset 0 -3px 0 0 var(--mantine-color-blue-6)' : null,
+		]
+			.filter(Boolean)
+			.join(', '),
+		opacity: params.draggedIndex === params.index ? 0.55 : 1,
+	};
+}
+
+export function StPromptBlockList({
+	entries,
+	promptMap,
+	isPromptCollapsed,
+	onTogglePromptCollapsed,
+	onUpdatePreferredOrder,
+	onRemovePrompt,
+	onSetPromptContent,
+	onUpdateCustomPromptField,
+}: StPromptBlockListProps) {
+	const { t } = useTranslation();
+	const [draggedIndex, setDraggedIndex] = useState<number | null>(null);
+	const [dropSlotIndex, setDropSlotIndex] = useState<number | null>(null);
+
+	const clearDragState = () => {
+		setDraggedIndex(null);
+		setDropSlotIndex(null);
+	};
+
+	const commitDrop = (slotIndex: number) => {
+		if (draggedIndex === null) return;
+
+		const targetIndex = resolveDropTargetIndex(draggedIndex, slotIndex);
+		if (targetIndex < 0 || targetIndex >= entries.length || targetIndex === draggedIndex) {
+			clearDragState();
+			return;
+		}
+
+		onUpdatePreferredOrder((order) => movePromptOrderItem(order, draggedIndex, targetIndex));
+		clearDragState();
+	};
+
+	const handleDragStart = (event: ReactDragEvent<HTMLButtonElement>, index: number) => {
+		setDraggedIndex(index);
+		setDropSlotIndex(index);
+		event.dataTransfer.effectAllowed = 'move';
+		event.dataTransfer.setData('text/plain', String(index));
+	};
+
+	const handleDragOver = (event: ReactDragEvent<HTMLDivElement>, index: number) => {
+		if (draggedIndex === null) return;
+		event.preventDefault();
+		event.dataTransfer.dropEffect = 'move';
+		setDropSlotIndex(resolveDropSlotIndex(event, index));
+	};
+
+	const handleDrop = (event: ReactDragEvent<HTMLDivElement>, index: number) => {
+		if (draggedIndex === null) return;
+		event.preventDefault();
+		commitDrop(resolveDropSlotIndex(event, index));
+	};
+
+	const handleReorderKeyDown = (event: ReactKeyboardEvent<HTMLButtonElement>, index: number) => {
+		let targetIndex: number | null = null;
+
+		if (event.key === 'ArrowUp') {
+			targetIndex = index - 1;
+		} else if (event.key === 'ArrowDown') {
+			targetIndex = index + 1;
+		} else if (event.key === 'Home') {
+			targetIndex = 0;
+		} else if (event.key === 'End') {
+			targetIndex = entries.length - 1;
+		}
+
+		if (targetIndex === null || targetIndex < 0 || targetIndex >= entries.length || targetIndex === index) {
+			return;
+		}
+
+		event.preventDefault();
+		onUpdatePreferredOrder((order) => movePromptOrderItem(order, index, targetIndex));
+	};
+
+	return (
+		<>
+			{entries.map((entry, index) => {
+				const prompt = normalizePromptForEdit(promptMap.get(entry.identifier), entry.identifier);
+				const sourceLabel = getStPromptSourceLabel(entry.identifier);
+				const standardPrompt = !isCustomPrompt(entry.identifier);
+				const runtimeManagedMarker = isSystemMarkerPrompt(prompt) && Boolean(sourceLabel);
+				const collapsibleMarker = runtimeManagedMarker || prompt.marker === true;
+				const isCollapsed = isPromptCollapsed(entry.identifier, collapsibleMarker);
+
+				return (
+					<Stack
+						key={`${entry.identifier}_${index}`}
+						gap={6}
+						p="xs"
+						style={createCardStyle({ draggedIndex, dropSlotIndex, index })}
+						onDragOver={(event) => handleDragOver(event, index)}
+						onDrop={(event) => handleDrop(event, index)}
+					>
+						<Group justify="space-between" align="center">
+							<Group gap="xs" align="center" wrap="nowrap">
+								<ActionIcon
+									variant="subtle"
+									size="sm"
+									onClick={() => onTogglePromptCollapsed(entry.identifier, collapsibleMarker)}
+									aria-label={
+										isCollapsed
+											? t('instructions.actions.expandBlock')
+											: t('instructions.actions.collapseBlock')
+									}
+								>
+									{isCollapsed ? <LuChevronRight size={16} /> : <LuChevronDown size={16} />}
+								</ActionIcon>
+								<ActionIcon
+									variant="subtle"
+									size="sm"
+									draggable
+									onDragStart={(event) => handleDragStart(event, index)}
+									onDragEnd={clearDragState}
+									onKeyDown={(event) => handleReorderKeyDown(event, index)}
+									aria-label={t('instructions.actions.reorderBlock')}
+									title={t('instructions.actions.reorderBlock')}
+									style={{ cursor: draggedIndex === index ? 'grabbing' : 'grab' }}
+								>
+									<LuGripVertical size={16} />
+								</ActionIcon>
+								<Switch
+									checked={entry.enabled}
+									onChange={(event) => {
+										const enabled = event.currentTarget.checked;
+										onUpdatePreferredOrder((order) =>
+											order.map((item, itemIndex) =>
+												itemIndex === index ? { ...item, enabled } : item,
+											),
+										);
+									}}
+									size="sm"
+								/>
+								<Stack gap={0}>
+									<Text size="sm" fw={500}>
+										{prompt.name || entry.identifier}
+									</Text>
+									<Text size="xs" c="dimmed">
+										{entry.identifier}
+									</Text>
+								</Stack>
+							</Group>
+							<ActionIcon
+								variant="subtle"
+								color="red"
+								onClick={() => onRemovePrompt(entry.identifier, index)}
+								aria-label={t('common.delete')}
+								title={t('common.delete')}
+							>
+								<LuTrash2 size={16} />
+							</ActionIcon>
+						</Group>
+
+						<Collapse in={!isCollapsed}>
+							<Stack gap={8}>
+								<Text size="xs" c="dimmed">
+									{formatPromptMeta(prompt, t)}
+								</Text>
+
+								{isCustomPrompt(entry.identifier) && (
+									<Group grow align="flex-start">
+										<TextInput
+											label={t('instructions.fields.promptName')}
+											value={prompt.name ?? ''}
+											onChange={(event) =>
+												onUpdateCustomPromptField(entry.identifier, {
+													name: event.currentTarget.value.trim() || undefined,
+												})
+											}
+										/>
+										<Select
+											label={t('instructions.fields.promptRole')}
+											value={prompt.role ?? 'system'}
+											onChange={(value) =>
+												onUpdateCustomPromptField(entry.identifier, {
+													role: (value as StBasePrompt['role'] | null) ?? 'system',
+												})
+											}
+											data={[
+												{ value: 'system', label: 'system' },
+												{ value: 'user', label: 'user' },
+												{ value: 'assistant', label: 'assistant' },
+											]}
+											allowDeselect={false}
+										/>
+									</Group>
+								)}
+
+								{isCustomPrompt(entry.identifier) && (
+									<Group gap="lg">
+										<Switch
+											label="system_prompt"
+											checked={prompt.system_prompt === true}
+											onChange={(event) =>
+												onUpdateCustomPromptField(entry.identifier, {
+													system_prompt: event.currentTarget.checked,
+												})
+											}
+										/>
+										<Switch
+											label={t('instructions.fields.markerLabel')}
+											checked={prompt.marker === true}
+											onChange={(event) =>
+												onUpdateCustomPromptField(entry.identifier, {
+													marker: event.currentTarget.checked,
+												})
+											}
+										/>
+									</Group>
+								)}
+
+								{runtimeManagedMarker ? (
+									<Alert color="blue" variant="light" title={t('instructions.fields.systemBlockTitle')}>
+										<Stack gap={4}>
+											<Text size="sm">{t('instructions.fields.systemBlockDescription')}</Text>
+											{sourceLabel ? (
+												<Text size="sm">
+													{t('instructions.fields.systemBlockSource')}: {sourceLabel}
+												</Text>
+											) : null}
+										</Stack>
+									</Alert>
+								) : (
+									<Textarea
+										value={prompt.content ?? ''}
+										onChange={(event) => onSetPromptContent(entry.identifier, event.currentTarget.value)}
+										placeholder={t('instructions.placeholders.promptBlockContent')}
+										description={prompt.marker ? t('instructions.fields.markerDescription') : undefined}
+										minRows={4}
+										autosize
+										styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
+									/>
+								)}
+
+								{!standardPrompt && (
+									<Text size="xs" c="dimmed">
+										{t('instructions.fields.customBlockHint')}
+									</Text>
+								)}
+							</Stack>
+						</Collapse>
+					</Stack>
+				);
+			})}
+		</>
+	);
+}
diff --git a/web/src/i18n/resources/en/instructions.ts b/web/src/i18n/resources/en/instructions.ts
index de30dc84..a738b5af 100644
--- a/web/src/i18n/resources/en/instructions.ts
+++ b/web/src/i18n/resources/en/instructions.ts
@@ -26,6 +26,9 @@ const enInstructions = {
 		addPromptBlock: 'Add block',
 		addCustomBlock: 'Add custom block',
 		resetCustomBlock: 'Reset form',
+		expandBlock: 'Expand block',
+		collapseBlock: 'Collapse block',
+		reorderBlock: 'Drag to reorder block',
 		discardAndSwitch: 'Discard and switch',
 		importWithoutSensitive: 'Import without sensitive fields',
 		importAsIs: 'Import as-is',
@@ -40,6 +43,7 @@ const enInstructions = {
 		prerender: 'Prerender',
 		prerenderDescription: 'Liquid render result on backend (without LLM generation).',
 		promptBlocks: 'Prompt blocks',
+		reorderBlocksHint: 'Drag blocks to change their order. Arrow keys also work on the drag handle.',
 		addStandardBlock: 'Add standard block',
 		addCustomBlock: 'Add custom block',
 		promptIdentifier: 'Identifier',
diff --git a/web/src/i18n/resources/ru/instructions.ts b/web/src/i18n/resources/ru/instructions.ts
index 0bcbe61a..ef512a92 100644
--- a/web/src/i18n/resources/ru/instructions.ts
+++ b/web/src/i18n/resources/ru/instructions.ts
@@ -26,6 +26,9 @@ const ruInstructions = {
 		addPromptBlock: 'Добавить блок',
 		addCustomBlock: 'Добавить свой блок',
 		resetCustomBlock: 'Сбросить форму',
+		expandBlock: 'Развернуть блок',
+		collapseBlock: 'Свернуть блок',
+		reorderBlock: 'Перетащить для изменения порядка блока',
 		discardAndSwitch: 'Отбросить и переключить',
 		importWithoutSensitive: 'Импорт без чувствительных полей',
 		importAsIs: 'Импортировать как есть',
@@ -40,6 +43,7 @@ const ruInstructions = {
 		prerender: 'Пререндер',
 		prerenderDescription: 'Результат рендера Liquid на бэкенде (без генерации LLM).',
 		promptBlocks: 'Блоки промпта',
+		reorderBlocksHint: 'Перетаскивайте блоки, чтобы менять порядок. На handle также работают стрелки клавиатуры.',
 		addStandardBlock: 'Стандартный блок',
 		addCustomBlock: 'Свой блок',
 		promptIdentifier: 'Identifier',

From 102b8debeb8a5a06584929c3064d51ffd5b21797 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 4 Apr 2026 23:32:04 +0300
Subject: [PATCH 33/54] fix: simplify ST prompt block editor UX

---
 .../instructions/instruction-editor.tsx       | 317 +++---------------
 .../st-prompt-block-create-modal.tsx          |  63 ++++
 .../st-prompt-block-editor-modal.tsx          | 133 ++++++++
 .../st-prompt-block-editor-state.test.ts      |  92 +++++
 .../st-prompt-block-editor-state.ts           |  60 ++++
 .../st-prompt-block-form-fields.tsx           |  57 ++++
 .../instructions/st-prompt-block-list.tsx     | 242 ++++---------
 .../instructions/st-prompt-blocks.test.ts     |  94 ++++++
 .../sidebars/instructions/st-prompt-blocks.ts |  60 ++++
 web/src/i18n/resources/en/instructions.ts     |  26 +-
 web/src/i18n/resources/ru/instructions.ts     |  26 +-
 11 files changed, 688 insertions(+), 482 deletions(-)
 create mode 100644 web/src/features/sidebars/instructions/st-prompt-block-create-modal.tsx
 create mode 100644 web/src/features/sidebars/instructions/st-prompt-block-editor-modal.tsx
 create mode 100644 web/src/features/sidebars/instructions/st-prompt-block-editor-state.test.ts
 create mode 100644 web/src/features/sidebars/instructions/st-prompt-block-editor-state.ts
 create mode 100644 web/src/features/sidebars/instructions/st-prompt-block-form-fields.tsx
 create mode 100644 web/src/features/sidebars/instructions/st-prompt-blocks.test.ts
 create mode 100644 web/src/features/sidebars/instructions/st-prompt-blocks.ts

diff --git a/web/src/features/sidebars/instructions/instruction-editor.tsx b/web/src/features/sidebars/instructions/instruction-editor.tsx
index c1a279da..31adb908 100644
--- a/web/src/features/sidebars/instructions/instruction-editor.tsx
+++ b/web/src/features/sidebars/instructions/instruction-editor.tsx
@@ -1,5 +1,4 @@
-import { Accordion, Button, Collapse, Group, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
-import { isValidSillyTavernPromptIdentifier } from '@shared/utils/sillytavern-preset';
+import { Accordion, Button, Group, Stack, Text, TextInput, Textarea } from '@mantine/core';
 import { useUnit } from 'effector-react';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -9,53 +8,22 @@ import { $currentBranchId, $currentChat, $currentEntityProfile } from '@model/ch
 import { $selectedInstruction, instructionEditorDraftChanged } from '@model/instructions';
 import {
 	createEmptyStBaseConfig,
-	getStPromptDefinition,
 	resolvePreferredPromptOrder,
-	ST_SYSTEM_PROMPT_DEFAULTS,
 } from '@model/instructions/st-preset';
 import { LiquidDocsButton } from '@ui/liquid-template-docs';
 
 import { prerenderInstruction } from '../../../api/instructions';
 
+import { StPromptBlockCreateModal } from './st-prompt-block-create-modal';
 import { StPromptBlockList } from './st-prompt-block-list';
+import {
+	createCustomPrompt,
+	normalizePromptForEdit,
+	type PromptBlockFields,
+} from './st-prompt-blocks';
 
 import type { StBaseConfig, StBasePrompt } from '@shared/types/instructions';
 
-type CustomPromptDraft = {
-	identifier: string;
-	name: string;
-	role: 'system' | 'user' | 'assistant';
-	system_prompt: boolean;
-	marker: boolean;
-	content: string;
-};
-
-const STANDARD_PROMPT_IDENTIFIERS = ST_SYSTEM_PROMPT_DEFAULTS.map((item) => item.identifier);
-
-function normalizePromptForEdit(prompt: StBasePrompt | undefined, identifier: string): StBasePrompt {
-	if (prompt) return { ...prompt };
-	const definition = getStPromptDefinition(identifier);
-	if (definition) return { ...definition };
-	return {
-		identifier,
-		name: identifier,
-		role: 'system',
-		system_prompt: true,
-		content: '',
-	};
-}
-
-function createEmptyCustomPromptDraft(): CustomPromptDraft {
-	return {
-		identifier: '',
-		name: '',
-		role: 'system',
-		system_prompt: true,
-		marker: false,
-		content: '',
-	};
-}
-
 export const InstructionEditor = () => {
 	const { t } = useTranslation();
 	const instruction = useUnit($selectedInstruction);
@@ -63,12 +31,7 @@ export const InstructionEditor = () => {
 
 	const [basicTemplateText, setBasicTemplateText] = useState('');
 	const [stBase, setStBase] = useState<StBaseConfig | null>(null);
-	const [addBlockOpened, setAddBlockOpened] = useState(false);
-	const [newStandardPromptIdentifier, setNewStandardPromptIdentifier] = useState<string | null>(null);
-	const [customPromptDraft, setCustomPromptDraft] = useState<CustomPromptDraft>(createEmptyCustomPromptDraft);
-	const [customPromptError, setCustomPromptError] = useState<string | null>(null);
-	const [collapsedPromptById, setCollapsedPromptById] = useState<Record<string, boolean>>({});
-
+	const [createBlockOpened, setCreateBlockOpened] = useState(false);
 	const [preview, setPreview] = useState('');
 	const [previewError, setPreviewError] = useState<string | null>(null);
 	const [previewLoading, setPreviewLoading] = useState(false);
@@ -78,14 +41,15 @@ export const InstructionEditor = () => {
 	useEffect(() => {
 		const nextInstruction = instruction;
 		const nextInstructionId = nextInstruction?.id ?? null;
+
 		if (nextInstructionId === null) {
 			lastResetInstructionIdRef.current = null;
 			setBasicTemplateText('');
 			setStBase(null);
 			return;
 		}
-		if (!nextInstruction) return;
-		if (lastResetInstructionIdRef.current === nextInstructionId) return;
+
+		if (!nextInstruction || lastResetInstructionIdRef.current === nextInstructionId) return;
 		lastResetInstructionIdRef.current = nextInstructionId;
 
 		if (nextInstruction.kind === 'basic') {
@@ -95,11 +59,8 @@ export const InstructionEditor = () => {
 			setBasicTemplateText('');
 			setStBase(structuredClone(nextInstruction.stBase));
 		}
-		setAddBlockOpened(false);
-		setNewStandardPromptIdentifier(null);
-		setCustomPromptDraft(createEmptyCustomPromptDraft());
-		setCustomPromptError(null);
-		setCollapsedPromptById({});
+
+		setCreateBlockOpened(false);
 		setPreview('');
 		setPreviewError(null);
 	}, [instruction]);
@@ -143,11 +104,6 @@ export const InstructionEditor = () => {
 		return map;
 	}, [stBase]);
 
-	const addablePromptIdentifiers = useMemo(() => {
-		const used = new Set(preferredOrder?.order.map((item) => item.identifier) ?? []);
-		return STANDARD_PROMPT_IDENTIFIERS.filter((identifier) => !used.has(identifier));
-	}, [preferredOrder?.order]);
-
 	const rawPresetJson = useMemo(() => {
 		if (!stBase) return '';
 		try {
@@ -159,30 +115,19 @@ export const InstructionEditor = () => {
 
 	if (!instruction) return null;
 
-	const isPromptCollapsed = (identifier: string, isMarkerPrompt: boolean): boolean => {
-		const value = collapsedPromptById[identifier];
-		if (typeof value === 'boolean') return value;
-		return isMarkerPrompt;
-	};
-
-	const togglePromptCollapsed = (identifier: string, isMarkerPrompt: boolean) => {
-		setCollapsedPromptById((current) => ({
-			...current,
-			[identifier]: !isPromptCollapsed(identifier, isMarkerPrompt),
-		}));
-	};
-
 	const updatePreferredOrder = (
 		updater: (
-			order: Array<{ identifier: string; enabled: boolean }>
-		) => Array<{ identifier: string; enabled: boolean }>
+			order: Array<{ identifier: string; enabled: boolean }>,
+		) => Array<{ identifier: string; enabled: boolean }>,
 	) => {
 		setStBase((current) => {
 			if (!current) return current;
+
 			const selectedOrder = resolvePreferredPromptOrder(current);
 			const nextOrder = updater(selectedOrder.order.map((item) => ({ ...item })));
 			const existingIndex = current.promptOrder.findIndex((item) => item.character_id === selectedOrder.character_id);
 			const nextPromptOrder = [...current.promptOrder];
+
 			if (existingIndex >= 0) {
 				nextPromptOrder[existingIndex] = {
 					...nextPromptOrder[existingIndex],
@@ -194,6 +139,7 @@ export const InstructionEditor = () => {
 					order: nextOrder,
 				});
 			}
+
 			return {
 				...current,
 				promptOrder: nextPromptOrder,
@@ -204,12 +150,14 @@ export const InstructionEditor = () => {
 	const upsertPrompt = (prompt: StBasePrompt) => {
 		setStBase((current) => {
 			if (!current) return current;
+
 			const index = current.prompts.findIndex((item) => item.identifier === prompt.identifier);
 			if (index >= 0) {
 				const prompts = [...current.prompts];
 				prompts[index] = { ...prompts[index], ...prompt };
 				return { ...current, prompts };
 			}
+
 			return {
 				...current,
 				prompts: [...current.prompts, prompt],
@@ -222,18 +170,12 @@ export const InstructionEditor = () => {
 			if (order.some((item) => item.identifier === identifier)) {
 				return order.map((item) => (item.identifier === identifier ? { ...item, enabled: true } : item));
 			}
-			return [...order, { identifier, enabled: true }];
-		});
-	};
 
-	const setPromptContent = (identifier: string, content: string) => {
-		upsertPrompt({
-			...normalizePromptForEdit(promptMap.get(identifier), identifier),
-			content,
+			return [...order, { identifier, enabled: true }];
 		});
 	};
 
-	const updateCustomPromptField = (identifier: string, patch: Partial<StBasePrompt>) => {
+	const updatePrompt = (identifier: string, patch: Partial<StBasePrompt>) => {
 		const existing = normalizePromptForEdit(promptMap.get(identifier), identifier);
 		upsertPrompt({
 			...existing,
@@ -244,10 +186,12 @@ export const InstructionEditor = () => {
 	const removePrompt = (identifier: string, index: number) => {
 		setStBase((current) => {
 			if (!current) return current;
+
 			const selectedOrder = resolvePreferredPromptOrder(current);
 			const nextOrder = selectedOrder.order.filter((_, itemIndex) => itemIndex !== index);
 			const existingIndex = current.promptOrder.findIndex((item) => item.character_id === selectedOrder.character_id);
 			const nextPromptOrder = [...current.promptOrder];
+
 			if (existingIndex >= 0) {
 				nextPromptOrder[existingIndex] = {
 					...nextPromptOrder[existingIndex],
@@ -261,7 +205,7 @@ export const InstructionEditor = () => {
 			}
 
 			const stillUsed = nextPromptOrder.some((item) =>
-				item.order.some((orderItem) => orderItem.identifier === identifier)
+				item.order.some((orderItem) => orderItem.identifier === identifier),
 			);
 
 			return {
@@ -274,51 +218,11 @@ export const InstructionEditor = () => {
 		});
 	};
 
-	const handleAddStandardPrompt = () => {
-		if (!newStandardPromptIdentifier) return;
-		const definition = getStPromptDefinition(newStandardPromptIdentifier);
-		upsertPrompt(
-			definition ?? {
-				identifier: newStandardPromptIdentifier,
-				name: newStandardPromptIdentifier,
-				role: 'system',
-				system_prompt: true,
-				content: '',
-			}
-		);
-		addPromptToPreferredOrder(newStandardPromptIdentifier);
-		setCollapsedPromptById((current) => ({ ...current, [newStandardPromptIdentifier]: false }));
-		setNewStandardPromptIdentifier(null);
-	};
-
-	const handleAddCustomPrompt = () => {
-		const identifier = customPromptDraft.identifier.trim();
-		if (!identifier) {
-			setCustomPromptError(t('instructions.validation.promptIdentifierRequired'));
-			return;
-		}
-		if (!isValidSillyTavernPromptIdentifier(identifier)) {
-			setCustomPromptError(t('instructions.validation.promptIdentifierInvalid'));
-			return;
-		}
-		if (promptMap.has(identifier) || preferredOrder?.order.some((item) => item.identifier === identifier)) {
-			setCustomPromptError(t('instructions.validation.promptIdentifierDuplicate'));
-			return;
-		}
-
-		upsertPrompt({
-			identifier,
-			name: customPromptDraft.name.trim() || undefined,
-			role: customPromptDraft.role,
-			system_prompt: customPromptDraft.system_prompt,
-			marker: customPromptDraft.marker,
-			content: customPromptDraft.content,
-		});
-		addPromptToPreferredOrder(identifier);
-		setCollapsedPromptById((current) => ({ ...current, [identifier]: false }));
-		setCustomPromptDraft(createEmptyCustomPromptDraft());
-		setCustomPromptError(null);
-		setAddBlockOpened(false);
+	const handleCreatePrompt = (fields: PromptBlockFields) => {
+		const prompt = createCustomPrompt(fields);
+		upsertPrompt(prompt);
+		addPromptToPreferredOrder(prompt.identifier);
+		setCreateBlockOpened(false);
 	};
 
 	const onPrerender = async () => {
@@ -352,7 +256,7 @@ export const InstructionEditor = () => {
 				</Text>
 			</Stack>
 
-			{instruction.kind === 'basic' && (
+			{instruction.kind === 'basic' ? (
 				<>
 					<Textarea
 						label={
@@ -369,13 +273,13 @@ export const InstructionEditor = () => {
 						styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
 					/>
 
-					{previewError && (
+					{previewError ? (
 						<Text c="red" size="sm">
 							{previewError}
 						</Text>
-					)}
+					) : null}
 
-					{preview.length > 0 && (
+					{preview.length > 0 ? (
 						<Textarea
 							label={t('instructions.fields.prerender')}
 							description={t('instructions.fields.prerenderDescription')}
@@ -385,7 +289,7 @@ export const InstructionEditor = () => {
 							autosize
 							styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
 						/>
-					)}
+					) : null}
 
 					<Group justify="flex-end">
 						<Button variant="light" loading={previewLoading} onClick={onPrerender}>
@@ -393,155 +297,34 @@ export const InstructionEditor = () => {
 						</Button>
 					</Group>
 				</>
-			)}
+			) : null}
 
-			{instruction.kind === 'st_base' && stBase && preferredOrder && (
+			{instruction.kind === 'st_base' && stBase && preferredOrder ? (
 				<Stack gap="sm">
-					<Group justify="space-between" align="flex-start">
-						<Stack gap={2}>
-							<Text fw={600}>{t('instructions.fields.promptBlocks')}</Text>
-							<Text size="xs" c="dimmed">
-								{t('instructions.fields.reorderBlocksHint')}
-							</Text>
-						</Stack>
+					<Group justify="space-between" align="center">
+						<Text fw={600}>{t('instructions.fields.promptBlocks')}</Text>
 						<Button
 							size="sm"
-							variant={addBlockOpened ? 'default' : 'light'}
+							variant={createBlockOpened ? 'default' : 'light'}
 							leftSection={<LuPlus size={14} />}
-							onClick={() => {
-								setAddBlockOpened((current) => !current);
-								setCustomPromptError(null);
-							}}
+							onClick={() => setCreateBlockOpened(true)}
 						>
 							{t('instructions.actions.addPromptBlock')}
 						</Button>
 					</Group>
 
-					<Collapse in={addBlockOpened}>
-						<Stack gap="md" p="sm" style={{ border: '1px solid var(--mantine-color-gray-3)', borderRadius: 8 }}>
-							<Stack gap="xs">
-								<Text fw={500}>{t('instructions.fields.addStandardBlock')}</Text>
-								<Group align="flex-end">
-									<Select
-										placeholder={t('instructions.placeholders.addPromptBlock')}
-										data={addablePromptIdentifiers.map((identifier) => ({
-											value: identifier,
-											label: getStPromptDefinition(identifier)?.name ?? identifier,
-										}))}
-										value={newStandardPromptIdentifier}
-										onChange={setNewStandardPromptIdentifier}
-										clearable
-										style={{ flex: 1 }}
-									/>
-									<Button variant="light" disabled={!newStandardPromptIdentifier} onClick={handleAddStandardPrompt}>
-										{t('common.add')}
-									</Button>
-								</Group>
-							</Stack>
-
-							<Stack gap="xs">
-								<Text fw={500}>{t('instructions.fields.addCustomBlock')}</Text>
-								<Group grow align="flex-start">
-									<TextInput
-										label={t('instructions.fields.promptIdentifier')}
-										value={customPromptDraft.identifier}
-										onChange={(event) => {
-											setCustomPromptDraft((current) => ({
-												...current,
-												identifier: event.currentTarget.value,
-											}));
-											setCustomPromptError(null);
-										}}
-										placeholder="my.custom-block"
-									/>
-									<TextInput
-										label={t('instructions.fields.promptName')}
-										value={customPromptDraft.name}
-										onChange={(event) =>
-											setCustomPromptDraft((current) => ({
-												...current,
-												name: event.currentTarget.value,
-											}))
-										}
-										placeholder={t('instructions.placeholders.promptName')}
-									/>
-									<Select
-										label={t('instructions.fields.promptRole')}
-										value={customPromptDraft.role}
-										onChange={(value) =>
-											setCustomPromptDraft((current) => ({
-												...current,
-												role: (value as CustomPromptDraft['role'] | null) ?? 'system',
-											}))
-										}
-										data={[
-											{ value: 'system', label: 'system' },
-											{ value: 'user', label: 'user' },
-											{ value: 'assistant', label: 'assistant' },
-										]}
-										allowDeselect={false}
-									/>
-								</Group>
-								<Group gap="lg">
-									<Switch
-										label="system_prompt"
-										checked={customPromptDraft.system_prompt}
-										onChange={(event) =>
-											setCustomPromptDraft((current) => ({
-												...current,
-												system_prompt: event.currentTarget.checked,
-											}))
-										}
-									/>
-									<Switch
-										label={t('instructions.fields.markerLabel')}
-										checked={customPromptDraft.marker}
-										onChange={(event) =>
-											setCustomPromptDraft((current) => ({
-												...current,
-												marker: event.currentTarget.checked,
-											}))
-										}
-									/>
-								</Group>
-								<Textarea
-									label={t('instructions.fields.promptContent')}
-									value={customPromptDraft.content}
-									onChange={(event) =>
-										setCustomPromptDraft((current) => ({
-											...current,
-											content: event.currentTarget.value,
-										}))
-									}
-									description={customPromptDraft.marker ? t('instructions.fields.markerDescription') : undefined}
-									minRows={4}
-									autosize
-									styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
-								/>
-								{customPromptError && (
-									<Text size="sm" c="red">
-										{customPromptError}
-									</Text>
-								)}
-								<Group justify="flex-end">
-									<Button variant="default" onClick={() => setCustomPromptDraft(createEmptyCustomPromptDraft())}>
-										{t('instructions.actions.resetCustomBlock')}
-									</Button>
-									<Button onClick={handleAddCustomPrompt}>{t('instructions.actions.addCustomBlock')}</Button>
-								</Group>
-							</Stack>
-						</Stack>
-					</Collapse>
-
 					<StPromptBlockList
 						entries={preferredOrder.order}
 						promptMap={promptMap}
-						isPromptCollapsed={isPromptCollapsed}
-						onTogglePromptCollapsed={togglePromptCollapsed}
 						onUpdatePreferredOrder={updatePreferredOrder}
 						onRemovePrompt={removePrompt}
-						onSetPromptContent={setPromptContent}
-						onUpdateCustomPromptField={updateCustomPromptField}
+						onUpdatePrompt={updatePrompt}
+					/>
+
+					<StPromptBlockCreateModal
+						opened={createBlockOpened}
+						onClose={() => setCreateBlockOpened(false)}
+						onCreate={handleCreatePrompt}
 					/>
 
 					<Accordion variant="separated">
@@ -567,7 +350,7 @@ export const InstructionEditor = () => {
 						</Accordion.Item>
 					</Accordion>
 				</Stack>
-			)}
+			) : null}
 		</Stack>
 	);
-};
+}
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-create-modal.tsx b/web/src/features/sidebars/instructions/st-prompt-block-create-modal.tsx
new file mode 100644
index 00000000..ccfed7fb
--- /dev/null
+++ b/web/src/features/sidebars/instructions/st-prompt-block-create-modal.tsx
@@ -0,0 +1,63 @@
+import { Button, Group, Modal, Stack } from '@mantine/core';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { StPromptBlockFormFields } from './st-prompt-block-form-fields';
+import {
+	createEmptyPromptBlockFields,
+	type PromptBlockFields,
+} from './st-prompt-blocks';
+
+type StPromptBlockCreateModalProps = {
+	opened: boolean;
+	onClose: () => void;
+	onCreate: (draft: PromptBlockFields) => void;
+};
+
+export function StPromptBlockCreateModal({
+	opened,
+	onClose,
+	onCreate,
+}: StPromptBlockCreateModalProps) {
+	const { t } = useTranslation();
+	const [draft, setDraft] = useState<PromptBlockFields>(createEmptyPromptBlockFields);
+
+	useEffect(() => {
+		if (!opened) {
+			setDraft(createEmptyPromptBlockFields());
+		}
+	}, [opened]);
+
+	const handleCreate = () => {
+		if (!draft.name.trim()) return;
+		onCreate(draft);
+		setDraft(createEmptyPromptBlockFields());
+		onClose();
+	};
+
+	return (
+		<Modal
+			opened={opened}
+			onClose={onClose}
+			title={t('instructions.dialogs.createPromptBlockTitle')}
+			centered
+			size="xl"
+		>
+			<Stack gap="md">
+				<StPromptBlockFormFields
+					value={draft}
+					onChange={(patch) => setDraft((current) => ({ ...current, ...patch }))}
+				/>
+
+				<Group justify="flex-end">
+					<Button variant="default" onClick={onClose}>
+						{t('common.cancel')}
+					</Button>
+					<Button onClick={handleCreate} disabled={!draft.name.trim()}>
+						{t('common.create')}
+					</Button>
+				</Group>
+			</Stack>
+		</Modal>
+	);
+}
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-editor-modal.tsx b/web/src/features/sidebars/instructions/st-prompt-block-editor-modal.tsx
new file mode 100644
index 00000000..cd5b9172
--- /dev/null
+++ b/web/src/features/sidebars/instructions/st-prompt-block-editor-modal.tsx
@@ -0,0 +1,133 @@
+import { Button, Group, Modal, Stack, Text } from '@mantine/core';
+import { useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import {
+	areStPromptBlockEditorStatesEqual,
+	resolveStPromptBlockEditorCloseAction,
+	type StPromptBlockEditorState,
+} from './st-prompt-block-editor-state';
+import { StPromptBlockFormFields } from './st-prompt-block-form-fields';
+
+type StPromptBlockEditorModalProps = {
+	opened: boolean;
+	value: StPromptBlockEditorState | null;
+	onClose: () => void;
+	onSave: (draft: StPromptBlockEditorState) => void;
+};
+
+export function StPromptBlockEditorModal({
+	opened,
+	value,
+	onClose,
+	onSave,
+}: StPromptBlockEditorModalProps) {
+	const { t } = useTranslation();
+	const [initialValue, setInitialValue] = useState<StPromptBlockEditorState | null>(null);
+	const [draft, setDraft] = useState<StPromptBlockEditorState | null>(null);
+	const [confirmCloseOpened, setConfirmCloseOpened] = useState(false);
+
+	useEffect(() => {
+		if (!opened || !value) {
+			setConfirmCloseOpened(false);
+			return;
+		}
+
+		setInitialValue(value);
+		setDraft(value);
+		setConfirmCloseOpened(false);
+	}, [opened, value]);
+
+	const hasChanges = useMemo(() => {
+		if (!initialValue || !draft) return false;
+		return !areStPromptBlockEditorStatesEqual(initialValue, draft);
+	}, [draft, initialValue]);
+
+	const requestClose = () => {
+		if (!initialValue || !draft) {
+			onClose();
+			return;
+		}
+
+		const action = resolveStPromptBlockEditorCloseAction(initialValue, draft);
+		if (action === 'close') {
+			onClose();
+			return;
+		}
+
+		setConfirmCloseOpened(true);
+	};
+
+	const handleSave = () => {
+		if (!draft) return;
+		onSave(draft);
+		setConfirmCloseOpened(false);
+		onClose();
+	};
+
+	return (
+		<>
+			<Modal
+				opened={opened && draft !== null}
+				onClose={requestClose}
+				title={t('instructions.dialogs.editPromptBlockTitle', {
+					name: draft?.name || '',
+				})}
+				centered
+				size="xl"
+			>
+				{draft ? (
+					<Stack gap="md">
+						<StPromptBlockFormFields
+							value={{
+								name: draft.name,
+								role: draft.role,
+								content: draft.content,
+							}}
+							contentReadOnly={draft.contentReadOnly}
+							onChange={(patch) =>
+								setDraft((current) => (current ? { ...current, ...patch } : current))
+							}
+						/>
+
+						<Group justify="flex-end">
+							<Button variant="default" onClick={requestClose}>
+								{t('common.close')}
+							</Button>
+							<Button onClick={handleSave} disabled={!hasChanges}>
+								{t('common.save')}
+							</Button>
+						</Group>
+					</Stack>
+				) : null}
+			</Modal>
+
+			<Modal
+				opened={confirmCloseOpened}
+				onClose={() => setConfirmCloseOpened(false)}
+				title={t('instructions.dialogs.savePromptBlockChangesTitle')}
+				centered
+			>
+				<Stack gap="md">
+					<Text>{t('instructions.confirm.savePromptBlockChanges')}</Text>
+					<Group justify="flex-end">
+						<Button variant="default" onClick={() => setConfirmCloseOpened(false)}>
+							{t('common.cancel')}
+						</Button>
+						<Button
+							variant="default"
+							color="red"
+							onClick={() => {
+								setConfirmCloseOpened(false);
+								onClose();
+							}}
+						>
+							{t('instructions.actions.discardBlockChanges')}
+						</Button>
+						<Button onClick={handleSave}>{t('common.save')}</Button>
+					</Group>
+				</Stack>
+			</Modal>
+		</>
+	);
+}
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-editor-state.test.ts b/web/src/features/sidebars/instructions/st-prompt-block-editor-state.test.ts
new file mode 100644
index 00000000..9a43fbec
--- /dev/null
+++ b/web/src/features/sidebars/instructions/st-prompt-block-editor-state.test.ts
@@ -0,0 +1,92 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+	areStPromptBlockEditorStatesEqual,
+	createStPromptBlockEditorSavePlan,
+	createStPromptBlockEditorState,
+	resolveStPromptBlockEditorCloseAction,
+} from './st-prompt-block-editor-state';
+
+describe('st prompt block editor state', () => {
+	it('keeps close action simple when nothing changed', () => {
+		const initial = createStPromptBlockEditorState({
+			prompt: {
+				identifier: 'main',
+				name: 'Main prompt',
+				role: 'system',
+				system_prompt: true,
+				content: 'Hello',
+			},
+			contentReadOnly: false,
+		});
+
+		expect(areStPromptBlockEditorStatesEqual(initial, { ...initial })).toBe(true);
+		expect(resolveStPromptBlockEditorCloseAction(initial, { ...initial })).toBe('close');
+	});
+
+	it('asks for confirmation when draft changed', () => {
+		const initial = createStPromptBlockEditorState({
+			prompt: {
+				identifier: 'authorNote',
+				name: 'Author note',
+				role: 'system',
+				system_prompt: true,
+				marker: false,
+				content: 'Initial',
+			},
+			contentReadOnly: false,
+		});
+
+		const changed = {
+			...initial,
+			content: 'Updated',
+		};
+
+		expect(areStPromptBlockEditorStatesEqual(initial, changed)).toBe(false);
+		expect(resolveStPromptBlockEditorCloseAction(initial, changed)).toBe('confirm-save');
+	});
+
+	it('builds save plan and trims blank names', () => {
+		const draft = createStPromptBlockEditorState({
+			prompt: {
+				identifier: 'custom.block',
+				name: 'Custom block',
+				role: 'assistant',
+				system_prompt: false,
+				marker: true,
+				content: 'Body',
+			},
+			contentReadOnly: false,
+		});
+
+		const plan = createStPromptBlockEditorSavePlan({
+			...draft,
+			name: '   ',
+			content: 'Updated body',
+		});
+
+		expect(plan).toEqual({
+			promptPatch: {
+				name: undefined,
+				role: 'assistant',
+				content: 'Updated body',
+			},
+		});
+	});
+
+	it('keeps read-only flag in state equality', () => {
+		const draft = createStPromptBlockEditorState({
+			prompt: {
+				identifier: 'main',
+				name: 'Main prompt',
+				role: 'system',
+				system_prompt: true,
+				content: 'Body',
+			},
+			contentReadOnly: true,
+		});
+
+		expect(areStPromptBlockEditorStatesEqual(draft, { ...draft })).toBe(true);
+		expect(areStPromptBlockEditorStatesEqual(draft, { ...draft, contentReadOnly: false })).toBe(false);
+	});
+});
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-editor-state.ts b/web/src/features/sidebars/instructions/st-prompt-block-editor-state.ts
new file mode 100644
index 00000000..904c49d3
--- /dev/null
+++ b/web/src/features/sidebars/instructions/st-prompt-block-editor-state.ts
@@ -0,0 +1,60 @@
+import type { StBasePrompt } from '@shared/types/instructions';
+
+export type StPromptBlockEditorState = {
+	identifier: string;
+	name: string;
+	role: 'system' | 'user' | 'assistant';
+	content: string;
+	contentReadOnly: boolean;
+};
+
+export type StPromptBlockEditorSavePlan = {
+	promptPatch: Pick<StBasePrompt, 'name' | 'role' | 'content'>;
+};
+
+type CreateStateParams = {
+	prompt: StBasePrompt;
+	contentReadOnly: boolean;
+};
+
+export function createStPromptBlockEditorState(params: CreateStateParams): StPromptBlockEditorState {
+	return {
+		identifier: params.prompt.identifier,
+		name: params.prompt.name ?? params.prompt.identifier,
+		role: params.prompt.role ?? 'system',
+		content: params.prompt.content ?? '',
+		contentReadOnly: params.contentReadOnly,
+	};
+}
+
+export function areStPromptBlockEditorStatesEqual(
+	left: StPromptBlockEditorState,
+	right: StPromptBlockEditorState,
+): boolean {
+	return (
+		left.identifier === right.identifier &&
+		left.name === right.name &&
+		left.role === right.role &&
+		left.content === right.content &&
+		left.contentReadOnly === right.contentReadOnly
+	);
+}
+
+export function resolveStPromptBlockEditorCloseAction(
+	initial: StPromptBlockEditorState,
+	current: StPromptBlockEditorState,
+): 'close' | 'confirm-save' {
+	return areStPromptBlockEditorStatesEqual(initial, current) ? 'close' : 'confirm-save';
+}
+
+export function createStPromptBlockEditorSavePlan(
+	state: StPromptBlockEditorState,
+): StPromptBlockEditorSavePlan {
+	return {
+		promptPatch: {
+			name: state.name.trim() || undefined,
+			role: state.role,
+			content: state.content,
+		},
+	};
+}
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-form-fields.tsx b/web/src/features/sidebars/instructions/st-prompt-block-form-fields.tsx
new file mode 100644
index 00000000..701cdeb9
--- /dev/null
+++ b/web/src/features/sidebars/instructions/st-prompt-block-form-fields.tsx
@@ -0,0 +1,57 @@
+import { Group, Select, TextInput, Textarea } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+
+import type { PromptBlockFields } from './st-prompt-blocks';
+
+type StPromptBlockFormFieldsProps = {
+	value: PromptBlockFields;
+	contentReadOnly?: boolean;
+	onChange: (patch: Partial<PromptBlockFields>) => void;
+};
+
+export function StPromptBlockFormFields({
+	value,
+	contentReadOnly = false,
+	onChange,
+}: StPromptBlockFormFieldsProps) {
+	const { t } = useTranslation();
+
+	return (
+		<>
+			<Group grow align="flex-start">
+				<TextInput
+					label={t('instructions.fields.promptName')}
+					value={value.name}
+					onChange={(event) => onChange({ name: event.currentTarget.value })}
+					placeholder={t('instructions.placeholders.promptName')}
+				/>
+				<Select
+					label={t('instructions.fields.promptRole')}
+					value={value.role}
+					onChange={(nextRole) =>
+						onChange({
+							role: (nextRole as PromptBlockFields['role'] | null) ?? 'system',
+						})
+					}
+					data={[
+						{ value: 'system', label: 'system' },
+						{ value: 'user', label: 'user' },
+						{ value: 'assistant', label: 'assistant' },
+					]}
+					allowDeselect={false}
+				/>
+			</Group>
+
+			<Textarea
+				label={t('instructions.fields.promptContent')}
+				value={value.content}
+				onChange={(event) => onChange({ content: event.currentTarget.value })}
+				placeholder={t('instructions.placeholders.promptBlockContent')}
+				minRows={12}
+				autosize
+				readOnly={contentReadOnly}
+				styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
+			/>
+		</>
+	);
+}
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-list.tsx b/web/src/features/sidebars/instructions/st-prompt-block-list.tsx
index 756e910d..3ba48dab 100644
--- a/web/src/features/sidebars/instructions/st-prompt-block-list.tsx
+++ b/web/src/features/sidebars/instructions/st-prompt-block-list.tsx
@@ -1,58 +1,31 @@
-import { ActionIcon, Alert, Collapse, Group, Select, Stack, Switch, Text, TextInput, Textarea } from '@mantine/core';
+import { ActionIcon, Group, Stack, Switch, Text } from '@mantine/core';
 import { useState, type DragEvent as ReactDragEvent, type KeyboardEvent as ReactKeyboardEvent } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuChevronDown, LuChevronRight, LuGripVertical, LuTrash2 } from 'react-icons/lu';
-
-import {
-	getStPromptDefinition,
-	getStPromptSourceLabel,
-	isSystemMarkerPrompt,
-	ST_SYSTEM_PROMPT_DEFAULTS,
-} from '@model/instructions/st-preset';
+import { LuGripVertical, LuPencil, LuTrash2 } from 'react-icons/lu';
 
 import { movePromptOrderItem, type PromptOrderItem } from './prompt-order';
+import { StPromptBlockEditorModal } from './st-prompt-block-editor-modal';
+import {
+	createStPromptBlockEditorSavePlan,
+	createStPromptBlockEditorState,
+	type StPromptBlockEditorState,
+} from './st-prompt-block-editor-state';
+import {
+	canDeletePrompt,
+	isRuntimeManagedPrompt,
+	normalizePromptForEdit,
+} from './st-prompt-blocks';
 
 import type { StBasePrompt } from '@shared/types/instructions';
 
-const STANDARD_PROMPT_IDENTIFIERS = new Set(ST_SYSTEM_PROMPT_DEFAULTS.map((item) => item.identifier));
-
 type StPromptBlockListProps = {
 	entries: PromptOrderItem[];
 	promptMap: Map<string, StBasePrompt>;
-	isPromptCollapsed: (identifier: string, isMarkerPrompt: boolean) => boolean;
-	onTogglePromptCollapsed: (identifier: string, isMarkerPrompt: boolean) => void;
 	onUpdatePreferredOrder: (updater: (order: PromptOrderItem[]) => PromptOrderItem[]) => void;
 	onRemovePrompt: (identifier: string, index: number) => void;
-	onSetPromptContent: (identifier: string, content: string) => void;
-	onUpdateCustomPromptField: (identifier: string, patch: Partial<StBasePrompt>) => void;
+	onUpdatePrompt: (identifier: string, patch: Partial<StBasePrompt>) => void;
 };
 
-function normalizePromptForEdit(prompt: StBasePrompt | undefined, identifier: string): StBasePrompt {
-	if (prompt) return { ...prompt };
-
-	const definition = getStPromptDefinition(identifier);
-	if (definition) return { ...definition };
-
-	return {
-		identifier,
-		name: identifier,
-		role: 'system',
-		system_prompt: true,
-		content: '',
-	};
-}
-
-function isCustomPrompt(identifier: string): boolean {
-	return !STANDARD_PROMPT_IDENTIFIERS.has(identifier);
-}
-
-function formatPromptMeta(prompt: StBasePrompt, t: (key: string) => string): string {
-	const parts: string[] = [prompt.role ?? 'system'];
-	if (prompt.system_prompt) parts.push('system_prompt');
-	if (prompt.marker) parts.push(t('instructions.fields.markerLabel'));
-	return parts.join(' · ');
-}
-
 function resolveDropSlotIndex(event: ReactDragEvent<HTMLElement>, index: number): number {
 	const rect = event.currentTarget.getBoundingClientRect();
 	const insertBefore = event.clientY < rect.top + rect.height / 2;
@@ -87,16 +60,14 @@ function createCardStyle(params: {
 export function StPromptBlockList({
 	entries,
 	promptMap,
-	isPromptCollapsed,
-	onTogglePromptCollapsed,
 	onUpdatePreferredOrder,
 	onRemovePrompt,
-	onSetPromptContent,
-	onUpdateCustomPromptField,
+	onUpdatePrompt,
 }: StPromptBlockListProps) {
 	const { t } = useTranslation();
 	const [draggedIndex, setDraggedIndex] = useState<number | null>(null);
 	const [dropSlotIndex, setDropSlotIndex] = useState<number | null>(null);
+	const [editingPrompt, setEditingPrompt] = useState<StPromptBlockEditorState | null>(null);
 
 	const clearDragState = () => {
 		setDraggedIndex(null);
@@ -139,15 +110,10 @@ export function StPromptBlockList({
 	const handleReorderKeyDown = (event: ReactKeyboardEvent<HTMLButtonElement>, index: number) => {
 		let targetIndex: number | null = null;
 
-		if (event.key === 'ArrowUp') {
-			targetIndex = index - 1;
-		} else if (event.key === 'ArrowDown') {
-			targetIndex = index + 1;
-		} else if (event.key === 'Home') {
-			targetIndex = 0;
-		} else if (event.key === 'End') {
-			targetIndex = entries.length - 1;
-		}
+		if (event.key === 'ArrowUp') targetIndex = index - 1;
+		else if (event.key === 'ArrowDown') targetIndex = index + 1;
+		else if (event.key === 'Home') targetIndex = 0;
+		else if (event.key === 'End') targetIndex = entries.length - 1;
 
 		if (targetIndex === null || targetIndex < 0 || targetIndex >= entries.length || targetIndex === index) {
 			return;
@@ -157,15 +123,16 @@ export function StPromptBlockList({
 		onUpdatePreferredOrder((order) => movePromptOrderItem(order, index, targetIndex));
 	};
 
+	const handlePromptSave = (draft: StPromptBlockEditorState) => {
+		const savePlan = createStPromptBlockEditorSavePlan(draft);
+		onUpdatePrompt(draft.identifier, savePlan.promptPatch);
+	};
+
 	return (
 		<>
 			{entries.map((entry, index) => {
 				const prompt = normalizePromptForEdit(promptMap.get(entry.identifier), entry.identifier);
-				const sourceLabel = getStPromptSourceLabel(entry.identifier);
-				const standardPrompt = !isCustomPrompt(entry.identifier);
-				const runtimeManagedMarker = isSystemMarkerPrompt(prompt) && Boolean(sourceLabel);
-				const collapsibleMarker = runtimeManagedMarker || prompt.marker === true;
-				const isCollapsed = isPromptCollapsed(entry.identifier, collapsibleMarker);
+				const deletable = canDeletePrompt(entry.identifier);
 
 				return (
 					<Stack
@@ -178,18 +145,6 @@ export function StPromptBlockList({
 					>
 						<Group justify="space-between" align="center">
 							<Group gap="xs" align="center" wrap="nowrap">
-								<ActionIcon
-									variant="subtle"
-									size="sm"
-									onClick={() => onTogglePromptCollapsed(entry.identifier, collapsibleMarker)}
-									aria-label={
-										isCollapsed
-											? t('instructions.actions.expandBlock')
-											: t('instructions.actions.collapseBlock')
-									}
-								>
-									{isCollapsed ? <LuChevronRight size={16} /> : <LuChevronDown size={16} />}
-								</ActionIcon>
 								<ActionIcon
 									variant="subtle"
 									size="sm"
@@ -203,6 +158,12 @@ export function StPromptBlockList({
 								>
 									<LuGripVertical size={16} />
 								</ActionIcon>
+								<Text size="sm" fw={500}>
+									{prompt.name || t('instructions.defaults.unnamedPromptBlock')}
+								</Text>
+							</Group>
+
+							<Group gap={4} wrap="nowrap">
 								<Switch
 									checked={entry.enabled}
 									onChange={(event) => {
@@ -215,117 +176,44 @@ export function StPromptBlockList({
 									}}
 									size="sm"
 								/>
-								<Stack gap={0}>
-									<Text size="sm" fw={500}>
-										{prompt.name || entry.identifier}
-									</Text>
-									<Text size="xs" c="dimmed">
-										{entry.identifier}
-									</Text>
-								</Stack>
+								<ActionIcon
+									variant="subtle"
+									onClick={() =>
+										setEditingPrompt(
+											createStPromptBlockEditorState({
+												prompt,
+												contentReadOnly: isRuntimeManagedPrompt(prompt),
+											}),
+										)
+									}
+									aria-label={t('instructions.actions.editBlock')}
+									title={t('instructions.actions.editBlock')}
+								>
+									<LuPencil size={16} />
+								</ActionIcon>
+								{deletable ? (
+									<ActionIcon
+										variant="subtle"
+										color="red"
+										onClick={() => onRemovePrompt(entry.identifier, index)}
+										aria-label={t('common.delete')}
+										title={t('common.delete')}
+									>
+										<LuTrash2 size={16} />
+									</ActionIcon>
+								) : null}
 							</Group>
-							<ActionIcon
-								variant="subtle"
-								color="red"
-								onClick={() => onRemovePrompt(entry.identifier, index)}
-								aria-label={t('common.delete')}
-								title={t('common.delete')}
-							>
-								<LuTrash2 size={16} />
-							</ActionIcon>
 						</Group>
-
-						<Collapse in={!isCollapsed}>
-							<Stack gap={8}>
-								<Text size="xs" c="dimmed">
-									{formatPromptMeta(prompt, t)}
-								</Text>
-
-								{isCustomPrompt(entry.identifier) && (
-									<Group grow align="flex-start">
-										<TextInput
-											label={t('instructions.fields.promptName')}
-											value={prompt.name ?? ''}
-											onChange={(event) =>
-												onUpdateCustomPromptField(entry.identifier, {
-													name: event.currentTarget.value.trim() || undefined,
-												})
-											}
-										/>
-										<Select
-											label={t('instructions.fields.promptRole')}
-											value={prompt.role ?? 'system'}
-											onChange={(value) =>
-												onUpdateCustomPromptField(entry.identifier, {
-													role: (value as StBasePrompt['role'] | null) ?? 'system',
-												})
-											}
-											data={[
-												{ value: 'system', label: 'system' },
-												{ value: 'user', label: 'user' },
-												{ value: 'assistant', label: 'assistant' },
-											]}
-											allowDeselect={false}
-										/>
-									</Group>
-								)}
-
-								{isCustomPrompt(entry.identifier) && (
-									<Group gap="lg">
-										<Switch
-											label="system_prompt"
-											checked={prompt.system_prompt === true}
-											onChange={(event) =>
-												onUpdateCustomPromptField(entry.identifier, {
-													system_prompt: event.currentTarget.checked,
-												})
-											}
-										/>
-										<Switch
-											label={t('instructions.fields.markerLabel')}
-											checked={prompt.marker === true}
-											onChange={(event) =>
-												onUpdateCustomPromptField(entry.identifier, {
-													marker: event.currentTarget.checked,
-												})
-											}
-										/>
-									</Group>
-								)}
-
-								{runtimeManagedMarker ? (
-									<Alert color="blue" variant="light" title={t('instructions.fields.systemBlockTitle')}>
-										<Stack gap={4}>
-											<Text size="sm">{t('instructions.fields.systemBlockDescription')}</Text>
-											{sourceLabel ? (
-												<Text size="sm">
-													{t('instructions.fields.systemBlockSource')}: {sourceLabel}
-												</Text>
-											) : null}
-										</Stack>
-									</Alert>
-								) : (
-									<Textarea
-										value={prompt.content ?? ''}
-										onChange={(event) => onSetPromptContent(entry.identifier, event.currentTarget.value)}
-										placeholder={t('instructions.placeholders.promptBlockContent')}
-										description={prompt.marker ? t('instructions.fields.markerDescription') : undefined}
-										minRows={4}
-										autosize
-										styles={{ input: { fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace' } }}
-									/>
-								)}
-
-								{!standardPrompt && (
-									<Text size="xs" c="dimmed">
-										{t('instructions.fields.customBlockHint')}
-									</Text>
-								)}
-							</Stack>
-						</Collapse>
 					</Stack>
 				);
 			})}
+
+			<StPromptBlockEditorModal
+				opened={editingPrompt !== null}
+				value={editingPrompt}
+				onClose={() => setEditingPrompt(null)}
+				onSave={handlePromptSave}
+			/>
 		</>
 	);
 }
diff --git a/web/src/features/sidebars/instructions/st-prompt-blocks.test.ts b/web/src/features/sidebars/instructions/st-prompt-blocks.test.ts
new file mode 100644
index 00000000..74ef19bd
--- /dev/null
+++ b/web/src/features/sidebars/instructions/st-prompt-blocks.test.ts
@@ -0,0 +1,94 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+	canDeletePrompt,
+	createCustomPrompt,
+	createEmptyPromptBlockFields,
+	isRuntimeManagedPrompt,
+	normalizePromptForEdit,
+} from './st-prompt-blocks';
+
+describe('st prompt blocks helpers', () => {
+	it('creates custom prompts with default uuid identifier generator', () => {
+		const prompt = createCustomPrompt({
+			name: 'Author Note',
+			role: 'system',
+			content: 'Body',
+		});
+
+		expect(prompt.identifier).toMatch(
+			/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i,
+		);
+	});
+
+	it('creates custom prompts with generated identifier and stable defaults', () => {
+		const prompt = createCustomPrompt(
+			{
+				name: 'Author Note',
+				role: 'assistant',
+				content: 'Body',
+			},
+			() => 'generated-uuid',
+		);
+
+		expect(prompt).toEqual({
+			identifier: 'generated-uuid',
+			name: 'Author Note',
+			role: 'assistant',
+			system_prompt: true,
+			marker: false,
+			content: 'Body',
+		});
+	});
+
+	it('marks only custom prompts as deletable', () => {
+		expect(canDeletePrompt('main')).toBe(false);
+		expect(canDeletePrompt('worldInfoBefore')).toBe(false);
+		expect(canDeletePrompt('2f9f5f0d-5ef0-4ef2-a7db-6301e6db5c77')).toBe(true);
+	});
+
+	it('detects runtime-managed prompts by known source identifiers and marker flag', () => {
+		expect(
+			isRuntimeManagedPrompt({
+				identifier: 'worldInfoBefore',
+				name: 'World Info',
+				role: 'system',
+				marker: true,
+			}),
+		).toBe(true);
+
+		expect(
+			isRuntimeManagedPrompt({
+				identifier: 'main',
+				name: 'Main',
+				role: 'system',
+				marker: false,
+			}),
+		).toBe(false);
+	});
+
+	it('falls back to definition or identifier when prompt data is partial', () => {
+		expect(normalizePromptForEdit(undefined, 'main')).toMatchObject({
+			identifier: 'main',
+			name: 'Main Prompt',
+			role: 'system',
+			system_prompt: true,
+		});
+
+		expect(normalizePromptForEdit(undefined, 'custom-id')).toEqual({
+			identifier: 'custom-id',
+			name: 'custom-id',
+			role: 'system',
+			system_prompt: true,
+			content: '',
+		});
+	});
+
+	it('creates empty prompt fields for modal state', () => {
+		expect(createEmptyPromptBlockFields()).toEqual({
+			name: '',
+			role: 'system',
+			content: '',
+		});
+	});
+});
diff --git a/web/src/features/sidebars/instructions/st-prompt-blocks.ts b/web/src/features/sidebars/instructions/st-prompt-blocks.ts
new file mode 100644
index 00000000..b71ee1a8
--- /dev/null
+++ b/web/src/features/sidebars/instructions/st-prompt-blocks.ts
@@ -0,0 +1,60 @@
+import { v4 as uuidv4 } from 'uuid';
+
+import { getStPromptDefinition, getStPromptSourceLabel, ST_SYSTEM_PROMPT_DEFAULTS } from '@model/instructions/st-preset';
+
+import type { StBasePrompt } from '@shared/types/instructions';
+
+const STANDARD_PROMPT_IDENTIFIERS = new Set(ST_SYSTEM_PROMPT_DEFAULTS.map((item) => item.identifier));
+
+export type PromptBlockRole = NonNullable<StBasePrompt['role']>;
+
+export type PromptBlockFields = {
+	name: string;
+	role: PromptBlockRole;
+	content: string;
+};
+
+export function createEmptyPromptBlockFields(): PromptBlockFields {
+	return {
+		name: '',
+		role: 'system',
+		content: '',
+	};
+}
+
+export function normalizePromptForEdit(prompt: StBasePrompt | undefined, identifier: string): StBasePrompt {
+	if (prompt) return { ...prompt };
+
+	const definition = getStPromptDefinition(identifier);
+	if (definition) return { ...definition };
+
+	return {
+		identifier,
+		name: identifier,
+		role: 'system',
+		system_prompt: true,
+		content: '',
+	};
+}
+
+export function canDeletePrompt(identifier: string): boolean {
+	return !STANDARD_PROMPT_IDENTIFIERS.has(identifier);
+}
+
+export function isRuntimeManagedPrompt(prompt: StBasePrompt): boolean {
+	return prompt.marker === true && Boolean(getStPromptSourceLabel(prompt.identifier));
+}
+
+export function createCustomPrompt(
+	fields: PromptBlockFields,
+	createIdentifier: () => string = uuidv4,
+): StBasePrompt {
+	return {
+		identifier: createIdentifier(),
+		name: fields.name.trim() || undefined,
+		role: fields.role,
+		system_prompt: true,
+		marker: false,
+		content: fields.content,
+	};
+}
diff --git a/web/src/i18n/resources/en/instructions.ts b/web/src/i18n/resources/en/instructions.ts
index a738b5af..19d72b01 100644
--- a/web/src/i18n/resources/en/instructions.ts
+++ b/web/src/i18n/resources/en/instructions.ts
@@ -24,12 +24,12 @@ const enInstructions = {
 		saveAs: 'Save as new',
 		updateCurrent: 'Update current preset',
 		addPromptBlock: 'Add block',
-		addCustomBlock: 'Add custom block',
-		resetCustomBlock: 'Reset form',
+		editBlock: 'Edit block',
 		expandBlock: 'Expand block',
 		collapseBlock: 'Collapse block',
 		reorderBlock: 'Drag to reorder block',
 		discardAndSwitch: 'Discard and switch',
+		discardBlockChanges: 'Discard',
 		importWithoutSensitive: 'Import without sensitive fields',
 		importAsIs: 'Import as-is',
 	},
@@ -43,31 +43,19 @@ const enInstructions = {
 		prerender: 'Prerender',
 		prerenderDescription: 'Liquid render result on backend (without LLM generation).',
 		promptBlocks: 'Prompt blocks',
-		reorderBlocksHint: 'Drag blocks to change their order. Arrow keys also work on the drag handle.',
-		addStandardBlock: 'Add standard block',
-		addCustomBlock: 'Add custom block',
-		promptIdentifier: 'Identifier',
 		promptName: 'Block name',
 		promptRole: 'Role',
 		promptContent: 'Block content',
-		markerLabel: 'marker',
-		markerDescription: 'Marker blocks may keep empty content.',
-		customBlockHint: 'Custom block fields are preserved for SillyTavern export.',
 		importSource: 'Import source',
 		importFileName: 'Imported file',
 		importedAt: 'Imported at',
 		rawPreset: 'Raw ST preset (round-trip storage)',
 		details: 'ST preset details',
-		systemBlockTitle: 'System block',
-		systemBlockDescription:
-			'This block is filled automatically by the runtime and is not edited directly in the preset.',
-		systemBlockSource: 'Runtime source',
 	},
 	placeholders: {
 		name: 'Enter name',
 		createInstructionType: 'Select preset type',
 		selectInstruction: 'Select instruction',
-		addPromptBlock: 'Add prompt block',
 		promptName: 'For example, Author Note',
 		promptBlockContent: 'Prompt content',
 	},
@@ -76,6 +64,7 @@ const enInstructions = {
 		newStBaseInstruction: 'New SillyTavern-like instruction',
 		newPreset: 'New preset',
 		importedInstruction: 'Imported instruction',
+		unnamedPromptBlock: 'Untitled',
 	},
 	kinds: {
 		basic: 'Simple',
@@ -84,6 +73,7 @@ const enInstructions = {
 	confirm: {
 		deleteInstruction: 'Delete instruction?',
 		discardChanges: 'You have unsaved changes. Discard them and switch preset?',
+		savePromptBlockChanges: 'This block has unsaved changes. Save them before closing?',
 		sensitiveImportChoice:
 			'Sensitive connection fields were found. Choose whether to strip them during import or keep them for round-trip export.',
 	},
@@ -95,6 +85,9 @@ const enInstructions = {
 		saveAsTitle: 'Save preset as',
 		deleteTitle: 'Delete preset',
 		discardTitle: 'Discard changes?',
+		editPromptBlockTitle: 'Edit block {{name}}',
+		createPromptBlockTitle: 'Create block',
+		savePromptBlockChangesTitle: 'Save block changes?',
 		sensitiveImportTitle: 'Sensitive import fields',
 	},
 	bundle: {
@@ -134,11 +127,6 @@ const enInstructions = {
 			importedCount: 'Imported resources: {{count}}',
 		},
 	},
-	validation: {
-		promptIdentifierRequired: 'Provide a block identifier.',
-		promptIdentifierInvalid: 'Identifier may contain only letters, numbers, dots, underscores, and hyphens.',
-		promptIdentifierDuplicate: 'A block with this identifier already exists.',
-	},
 	toasts: {
 		exportNotPossibleTitle: 'Export not possible',
 		selectForExport: 'Select an instruction to export',
diff --git a/web/src/i18n/resources/ru/instructions.ts b/web/src/i18n/resources/ru/instructions.ts
index ef512a92..3464402c 100644
--- a/web/src/i18n/resources/ru/instructions.ts
+++ b/web/src/i18n/resources/ru/instructions.ts
@@ -24,12 +24,12 @@ const ruInstructions = {
 		saveAs: 'Сохранить как новый',
 		updateCurrent: 'Обновить текущий пресет',
 		addPromptBlock: 'Добавить блок',
-		addCustomBlock: 'Добавить свой блок',
-		resetCustomBlock: 'Сбросить форму',
+		editBlock: 'Редактировать блок',
 		expandBlock: 'Развернуть блок',
 		collapseBlock: 'Свернуть блок',
 		reorderBlock: 'Перетащить для изменения порядка блока',
 		discardAndSwitch: 'Отбросить и переключить',
+		discardBlockChanges: 'Не сохранять',
 		importWithoutSensitive: 'Импорт без чувствительных полей',
 		importAsIs: 'Импортировать как есть',
 	},
@@ -43,31 +43,19 @@ const ruInstructions = {
 		prerender: 'Пререндер',
 		prerenderDescription: 'Результат рендера Liquid на бэкенде (без генерации LLM).',
 		promptBlocks: 'Блоки промпта',
-		reorderBlocksHint: 'Перетаскивайте блоки, чтобы менять порядок. На handle также работают стрелки клавиатуры.',
-		addStandardBlock: 'Стандартный блок',
-		addCustomBlock: 'Свой блок',
-		promptIdentifier: 'Identifier',
 		promptName: 'Название блока',
 		promptRole: 'Role',
 		promptContent: 'Содержимое блока',
-		markerLabel: 'marker',
-		markerDescription: 'Для marker-блока пустое содержимое допустимо.',
-		customBlockHint: 'Поля custom-блока сохраняются и экспортируются в формате SillyTavern.',
 		importSource: 'Источник импорта',
 		importFileName: 'Импортированный файл',
 		importedAt: 'Время импорта',
 		rawPreset: 'Raw ST preset (для round-trip хранения)',
 		details: 'Детали ST пресета',
-		systemBlockTitle: 'Системный блок',
-		systemBlockDescription:
-			'Этот блок автоматически заполняется рантаймом и не редактируется напрямую в пресете.',
-		systemBlockSource: 'Источник в рантайме',
 	},
 	placeholders: {
 		name: 'Введите название',
 		createInstructionType: 'Выберите тип пресета',
 		selectInstruction: 'Выберите инструкцию',
-		addPromptBlock: 'Добавить блок промпта',
 		promptName: 'Например, Author Note',
 		promptBlockContent: 'Содержимое блока',
 	},
@@ -76,6 +64,7 @@ const ruInstructions = {
 		newStBaseInstruction: 'Новая SillyTavern-like инструкция',
 		newPreset: 'Новый пресет',
 		importedInstruction: 'Импортированная инструкция',
+		unnamedPromptBlock: 'Без названия',
 	},
 	kinds: {
 		basic: 'Simple',
@@ -84,6 +73,7 @@ const ruInstructions = {
 	confirm: {
 		deleteInstruction: 'Удалить инструкцию?',
 		discardChanges: 'Есть несохранённые изменения. Отбросить их и переключить пресет?',
+		savePromptBlockChanges: 'В блоке есть несохранённые изменения. Сохранить их перед закрытием?',
 		sensitiveImportChoice:
 			'Найдены чувствительные connection-поля. Выберите, удалить их при импорте или сохранить для round-trip экспорта.',
 	},
@@ -95,6 +85,9 @@ const ruInstructions = {
 		saveAsTitle: 'Сохранить пресет как',
 		deleteTitle: 'Удалить пресет',
 		discardTitle: 'Отбросить изменения?',
+		editPromptBlockTitle: 'Редактировать блок {{name}}',
+		createPromptBlockTitle: 'Создать блок',
+		savePromptBlockChangesTitle: 'Сохранить изменения блока?',
 		sensitiveImportTitle: 'Чувствительные поля импорта',
 	},
 	bundle: {
@@ -134,11 +127,6 @@ const ruInstructions = {
 			importedCount: 'Импортировано сущностей: {{count}}',
 		},
 	},
-	validation: {
-		promptIdentifierRequired: 'Укажите identifier для блока.',
-		promptIdentifierInvalid: 'Identifier может содержать только буквы, цифры, точки, подчёркивания и дефисы.',
-		promptIdentifierDuplicate: 'Блок с таким identifier уже существует.',
-	},
 	toasts: {
 		exportNotPossibleTitle: 'Экспорт невозможен',
 		selectForExport: 'Выберите инструкцию для экспорта',

From 3c32218fa2707ca6ae6cc79dc699f7dc56845824 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Mon, 6 Apr 2026 22:24:32 +0300
Subject: [PATCH 34/54] Add in-chat position support for ST prompt blocks

---
 .../chat-core/schemas.instructions.test.ts    |  43 ++-
 server/src/chat-core/schemas.ts               |   3 +
 .../services/chat-core/instruction-st-base.ts | 292 +-----------------
 .../chat-core/instruction-st-preset.test.ts   | 123 ++++++++
 .../chat-core/prompt-draft-builder.test.ts    |  36 ++-
 .../chat-core/prompt-draft-builder.ts         |  23 +-
 .../services/chat-core/st-prompt-runtime.ts   | 260 ++++++++++++++++
 .../prompt/build-base-prompt.test.ts          |  43 ++-
 .../prompt/build-base-prompt.ts               |  13 +
 shared/types/instructions.ts                  |  12 +
 shared/utils/st-prompts.ts                    | 156 ++++++++++
 .../st-prompt-block-editor-modal.tsx          |   3 +
 .../st-prompt-block-editor-state.test.ts      |  29 ++
 .../st-prompt-block-editor-state.ts           |  17 +-
 .../st-prompt-block-form-fields.tsx           |  46 ++-
 .../instructions/st-prompt-blocks.test.ts     |  18 ++
 .../sidebars/instructions/st-prompt-blocks.ts |  27 +-
 web/src/i18n/resources/en/instructions.ts     |   8 +
 web/src/i18n/resources/ru/instructions.ts     |   8 +
 .../model/instructions/st-preset-prompts.ts   |  93 ++++++
 web/src/model/instructions/st-preset.test.ts  |  58 ++++
 web/src/model/instructions/st-preset.ts       | 178 +----------
 22 files changed, 1008 insertions(+), 481 deletions(-)
 create mode 100644 server/src/services/chat-core/st-prompt-runtime.ts
 create mode 100644 shared/utils/st-prompts.ts
 create mode 100644 web/src/model/instructions/st-preset-prompts.ts
 create mode 100644 web/src/model/instructions/st-preset.test.ts

diff --git a/server/src/chat-core/schemas.instructions.test.ts b/server/src/chat-core/schemas.instructions.test.ts
index a34a1544..df1086a1 100644
--- a/server/src/chat-core/schemas.instructions.test.ts
+++ b/server/src/chat-core/schemas.instructions.test.ts
@@ -22,7 +22,15 @@ describe("instruction schemas", () => {
       kind: "st_base",
       stBase: {
         rawPreset: {},
-        prompts: [{ identifier: "main", content: "Hello" }],
+        prompts: [
+          {
+            identifier: "main",
+            content: "Hello",
+            injection_position: 1,
+            injection_depth: 2,
+            injection_order: 50,
+          },
+        ],
         promptOrder: [
           {
             character_id: 100001,
@@ -41,6 +49,39 @@ describe("instruction schemas", () => {
     expect(parsed.success).toBe(true);
   });
 
+  test("rejects invalid prompt injection metadata", () => {
+    const parsed = createInstructionBodySchema.safeParse({
+      name: "ST",
+      kind: "st_base",
+      stBase: {
+        rawPreset: {},
+        prompts: [
+          {
+            identifier: "main",
+            content: "Hello",
+            injection_position: 2,
+            injection_depth: -1,
+            injection_order: -5,
+          },
+        ],
+        promptOrder: [
+          {
+            character_id: 100001,
+            order: [{ identifier: "main", enabled: true }],
+          },
+        ],
+        responseConfig: {},
+        importInfo: {
+          source: "sillytavern",
+          fileName: "Default.json",
+          importedAt: "2026-03-10T00:00:00.000Z",
+        },
+      },
+    });
+
+    expect(parsed.success).toBe(false);
+  });
+
   test("rejects mixed create payload", () => {
     const parsed = createInstructionBodySchema.safeParse({
       name: "Bad",
diff --git a/server/src/chat-core/schemas.ts b/server/src/chat-core/schemas.ts
index 2a6c0e5b..8e510575 100644
--- a/server/src/chat-core/schemas.ts
+++ b/server/src/chat-core/schemas.ts
@@ -118,6 +118,9 @@ const stBasePromptSchema = z.object({
   content: z.string().optional(),
   system_prompt: z.boolean().optional(),
   marker: z.boolean().optional(),
+  injection_position: z.union([z.literal(0), z.literal(1)]).optional(),
+  injection_depth: z.number().int().min(0).optional(),
+  injection_order: z.number().int().min(0).optional(),
 }).strict();
 
 const stBasePromptOrderEntrySchema = z.object({
diff --git a/server/src/services/chat-core/instruction-st-base.ts b/server/src/services/chat-core/instruction-st-base.ts
index cddb1d0b..07a19d5e 100644
--- a/server/src/services/chat-core/instruction-st-base.ts
+++ b/server/src/services/chat-core/instruction-st-base.ts
@@ -1,20 +1,21 @@
 import {
   isSillyTavernPreset,
   getSillyTavernPresetValidationError,
-  SILLY_TAVERN_PREFERRED_CHARACTER_ID,
 } from "@shared/utils/sillytavern-preset";
+import {
+  normalizeStPromptOrder,
+  normalizeStPrompts,
+} from "@shared/utils/st-prompts";
 
 import {
   BUILT_IN_SILLY_TAVERN_PRESET,
   BUILT_IN_SILLY_TAVERN_PRESET_FILE_NAME,
 } from "./built-in-sillytavern-preset";
-import { renderLiquidTemplate } from "./prompt-template-renderer";
 
-import type { InstructionRenderContext } from "./prompt-template-renderer";
+export { resolveStBaseInstructionRuntime } from "./st-prompt-runtime";
+
 import type {
   StBaseConfig,
-  StBasePrompt,
-  StBasePromptOrder,
   StBaseResponseConfig,
 } from "@shared/types/instructions";
 
@@ -31,30 +32,8 @@ export const ST_SENSITIVE_FIELDS = [
   "azure_deployment_name",
 ] as const;
 
-const ST_SUPPORTED_PROMPT_IDENTIFIERS = new Set([
-  "main",
-  "nsfw",
-  "jailbreak",
-  "worldInfoBefore",
-  "worldInfoAfter",
-  "charDescription",
-  "charPersonality",
-  "scenario",
-  "personaDescription",
-  "chatHistory",
-  "dialogueExamples",
-]);
-
 type SensitiveImportMode = "remove" | "keep";
 
-type ResolvedStBaseInstruction = {
-  systemPrompt: string;
-  preHistorySystemMessages: string[];
-  postHistorySystemMessages: string[];
-  derivedSettings: Record<string, unknown>;
-  usedPromptIdentifiers: string[];
-};
-
 type StResponseNumericKey =
   | "temperature"
   | "top_p"
@@ -68,16 +47,6 @@ type StResponseNumericKey =
   | "seed"
   | "n";
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-function asString(value: unknown): string | null {
-  if (typeof value !== "string") return null;
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : null;
-}
-
 function toFiniteNumber(value: unknown): number | undefined {
   if (typeof value !== "number" || !Number.isFinite(value)) return undefined;
   return value;
@@ -87,70 +56,6 @@ function toOptionalBoolean(value: unknown): boolean | undefined {
   return typeof value === "boolean" ? value : undefined;
 }
 
-function normalizeStPromptRole(
-  value: unknown
-): StBasePrompt["role"] | undefined {
-  if (value === "system" || value === "user" || value === "assistant") {
-    return value;
-  }
-  return undefined;
-}
-
-function normalizePrompt(prompt: unknown): StBasePrompt | null {
-  if (!isRecord(prompt)) return null;
-  const identifier = asString(prompt.identifier);
-  if (!identifier) return null;
-
-  const item: StBasePrompt = { identifier };
-  const name = asString(prompt.name);
-  if (name) item.name = name;
-
-  const role = normalizeStPromptRole(prompt.role);
-  if (role) item.role = role;
-
-  if (typeof prompt.content === "string") item.content = prompt.content;
-  if (typeof prompt.system_prompt === "boolean") {
-    item.system_prompt = prompt.system_prompt;
-  }
-  if (typeof prompt.marker === "boolean") {
-    item.marker = prompt.marker;
-  }
-  return item;
-}
-
-function normalizePromptOrderEntry(
-  value: unknown
-): { identifier: string; enabled: boolean } | null {
-  if (!isRecord(value)) return null;
-  const identifier = asString(value.identifier);
-  if (!identifier) return null;
-  return {
-    identifier,
-    enabled: typeof value.enabled === "boolean" ? value.enabled : true,
-  };
-}
-
-function normalizePromptOrderItem(value: unknown): StBasePromptOrder | null {
-  if (!isRecord(value)) return null;
-  const rawCharacterId = value.character_id;
-  const characterId =
-    typeof rawCharacterId === "number" && Number.isFinite(rawCharacterId)
-      ? Math.floor(rawCharacterId)
-      : null;
-  if (characterId === null) return null;
-
-  const rawOrder = Array.isArray(value.order) ? value.order : [];
-  const order = rawOrder
-    .map(normalizePromptOrderEntry)
-    .filter((entry): entry is { identifier: string; enabled: boolean } =>
-      Boolean(entry)
-    );
-  return {
-    character_id: characterId,
-    order,
-  };
-}
-
 export function detectStChatCompletionPreset(
   input: unknown
 ): input is Record<string, unknown> {
@@ -167,18 +72,6 @@ export function stripSensitiveFieldsFromPreset(
   return cloned;
 }
 
-export function normalizeStPrompts(input: unknown): StBasePrompt[] {
-  if (!Array.isArray(input)) return [];
-  return input.map(normalizePrompt).filter((item): item is StBasePrompt => Boolean(item));
-}
-
-export function normalizeStPromptOrder(input: unknown): StBasePromptOrder[] {
-  if (!Array.isArray(input)) return [];
-  return input
-    .map(normalizePromptOrderItem)
-    .filter((item): item is StBasePromptOrder => Boolean(item));
-}
-
 function normalizeResponseConfig(
   preset: Record<string, unknown>
 ): StBaseResponseConfig {
@@ -223,97 +116,6 @@ function normalizeResponseConfig(
   return responseConfig;
 }
 
-function resolvePreferredPromptOrderEntries(
-  promptOrder: StBasePromptOrder[]
-): Array<{ identifier: string; enabled: boolean }> {
-  if (promptOrder.length === 0) return [];
-  const preferred =
-    promptOrder.find(
-      (item) => item.character_id === SILLY_TAVERN_PREFERRED_CHARACTER_ID
-    ) ?? promptOrder[0];
-  return preferred.order;
-}
-
-function resolveDynamicPromptContent(params: {
-  identifier: string;
-  context: InstructionRenderContext;
-}): string {
-  const context = params.context;
-  const firstMessageExample =
-    typeof context.mesExamples === "string"
-      ? context.mesExamples
-      : typeof context.mesExamplesRaw === "string"
-        ? context.mesExamplesRaw
-        : "";
-
-  switch (params.identifier) {
-    case "worldInfoBefore":
-      return (
-        context.wiBefore ??
-        context.loreBefore ??
-        context.anchorBefore ??
-        ""
-      );
-    case "worldInfoAfter":
-      return (
-        context.wiAfter ??
-        context.loreAfter ??
-        context.anchorAfter ??
-        ""
-      );
-    case "charDescription":
-      return context.description ?? "";
-    case "charPersonality":
-      return context.personality ?? "";
-    case "scenario":
-      return context.scenario ?? "";
-    case "personaDescription":
-      return context.persona ?? "";
-    case "dialogueExamples":
-      return firstMessageExample;
-    default:
-      return "";
-  }
-}
-
-function toGatewaySettingsFromResponseConfig(
-  config: StBaseResponseConfig
-): Record<string, unknown> {
-  const settings: Record<string, unknown> = {};
-
-  if (typeof config.temperature === "number") settings.temperature = config.temperature;
-  if (typeof config.top_p === "number") settings.top_p = config.top_p;
-  if (typeof config.top_k === "number") settings.top_k = config.top_k;
-  if (typeof config.top_a === "number") settings.top_a = config.top_a;
-  if (typeof config.min_p === "number") settings.min_p = config.min_p;
-  if (typeof config.repetition_penalty === "number") {
-    settings.repetition_penalty = config.repetition_penalty;
-  }
-  if (typeof config.frequency_penalty === "number") {
-    settings.frequency_penalty = config.frequency_penalty;
-  }
-  if (typeof config.presence_penalty === "number") {
-    settings.presence_penalty = config.presence_penalty;
-  }
-  if (typeof config.openai_max_tokens === "number") {
-    settings.maxTokens = config.openai_max_tokens;
-  }
-  if (typeof config.seed === "number") settings.seed = config.seed;
-  if (typeof config.n === "number") settings.n = config.n;
-  if (typeof config.reasoning_effort === "string") {
-    settings.reasoning_effort = config.reasoning_effort;
-  }
-  if (typeof config.verbosity === "string") settings.verbosity = config.verbosity;
-  if (typeof config.enable_web_search === "boolean") {
-    settings.enable_web_search = config.enable_web_search;
-  }
-  if (typeof config.stream_openai === "boolean") {
-    settings.stream = config.stream_openai;
-  }
-
-  return settings;
-}
-
 export function createStBaseConfigFromPreset(params: {
   preset: Record<string, unknown>;
   fileName: string;
@@ -362,85 +164,3 @@ export async function loadBuiltInSillyTavernPreset(): Promise<{
     preset: parsed,
   };
 }
-
-export async function resolveStBaseInstructionRuntime(params: {
-  stBase: StBaseConfig;
-  context: InstructionRenderContext;
-}): Promise<ResolvedStBaseInstruction> {
-  const promptsByIdentifier = new Map(
-    params.stBase.prompts.map((item) => [item.identifier, item] as const)
-  );
-  const selectedOrder = resolvePreferredPromptOrderEntries(
-    params.stBase.promptOrder
-  );
-  const fallbackOrder =
-    selectedOrder.length > 0
-      ? selectedOrder
-      : params.stBase.prompts.map((item) => ({
-          identifier: item.identifier,
-          enabled: true,
-        }));
-
-  const preHistory: string[] = [];
-  const postHistory: string[] = [];
-  const usedPromptIdentifiers: string[] = [];
-  let afterHistory = false;
-
-  for (const orderEntry of fallbackOrder) {
-    if (!orderEntry.enabled) continue;
-    const identifier = orderEntry.identifier;
-    if (!ST_SUPPORTED_PROMPT_IDENTIFIERS.has(identifier)) continue;
-
-    if (identifier === "chatHistory") {
-      afterHistory = true;
-      usedPromptIdentifiers.push(identifier);
-      continue;
-    }
-
-    const prompt = promptsByIdentifier.get(identifier) ?? null;
-    const rawContent =
-      typeof prompt?.content === "string" && prompt.content.trim().length > 0
-        ? prompt.content
-        : resolveDynamicPromptContent({
-            identifier,
-            context: params.context,
-          });
-    if (!rawContent.trim()) continue;
-
-    const rendered = await renderLiquidTemplate({
-      templateText: rawContent,
-      context: params.context,
-    });
-    if (!rendered.trim()) continue;
-
-    if (afterHistory) postHistory.push(rendered);
-    else preHistory.push(rendered);
-    usedPromptIdentifiers.push(identifier);
-  }
-
-  let systemPrompt: string | null = null;
-  let preHistorySystemMessages: string[] = [];
-  let postHistorySystemMessages = [...postHistory];
-
-  if (preHistory.length > 0) {
-    systemPrompt = preHistory[0];
-    preHistorySystemMessages = preHistory.slice(1);
-  } else if (postHistory.length > 0) {
-    systemPrompt = postHistory[0];
-    postHistorySystemMessages = postHistory.slice(1);
-  }
-
-  if (!systemPrompt || !systemPrompt.trim()) {
-    throw new Error("st_base instruction did not resolve a system prompt");
-  }
-
-  return {
-    systemPrompt,
-    preHistorySystemMessages,
-    postHistorySystemMessages,
-    derivedSettings: toGatewaySettingsFromResponseConfig(
-      params.stBase.responseConfig
-    ),
-    usedPromptIdentifiers,
-  };
-}
diff --git a/server/src/services/chat-core/instruction-st-preset.test.ts b/server/src/services/chat-core/instruction-st-preset.test.ts
index 2663aa39..99282013 100644
--- a/server/src/services/chat-core/instruction-st-preset.test.ts
+++ b/server/src/services/chat-core/instruction-st-preset.test.ts
@@ -46,6 +46,13 @@ describe("instruction-st-base", () => {
 
     expect(normalized.prompts.length).toBe(3);
     expect(normalized.promptOrder.length).toBe(1);
+    expect(normalized.prompts[0]).toEqual(
+      expect.objectContaining({
+        injection_position: 0,
+        injection_depth: 4,
+        injection_order: 100,
+      })
+    );
     expect(normalized.responseConfig).toMatchObject({
       temperature: 1,
       top_p: 1,
@@ -227,4 +234,120 @@ describe("instruction-st-base", () => {
       "jailbreak",
     ]);
   });
+
+  test("collects in-chat prompts as ordered depth insertions", async () => {
+    const stBase = createStBaseConfigFromPreset({
+      preset: {
+        chat_completion_source: "openai",
+        prompts: [
+          {
+            identifier: "main",
+            role: "system",
+            content: "Main {{char.name}}",
+          },
+          {
+            identifier: "authorNote",
+            role: "user",
+            content: "Note {{user.name}}",
+            injection_position: 1,
+            injection_depth: 2,
+            injection_order: 80,
+          },
+        ],
+        prompt_order: [
+          {
+            character_id: 100001,
+            order: [
+              { identifier: "main", enabled: true },
+              { identifier: "chatHistory", enabled: true },
+              { identifier: "authorNote", enabled: true },
+            ],
+          },
+        ],
+      },
+      fileName: "Default.json",
+      sensitiveImportMode: "keep",
+    });
+
+    const resolved = await resolveStBaseInstructionRuntime({
+      stBase,
+      context: {
+        char: { name: "Lilly" },
+        user: { name: "Dima" },
+        chat: {},
+        messages: [],
+        rag: {},
+        art: {},
+        now: new Date("2026-02-13T00:00:00.000Z").toISOString(),
+      },
+    });
+
+    expect(resolved.systemPrompt).toBe("Main Lilly");
+    expect(resolved.depthInsertions).toEqual([
+      { depth: 2, role: "user", order: 80, content: "Note Dima" },
+    ]);
+  });
+
+  test("maps relative prompts around absolute main prompt into the same in-chat bucket", async () => {
+    const stBase = createStBaseConfigFromPreset({
+      preset: {
+        chat_completion_source: "openai",
+        prompts: [
+          {
+            identifier: "main",
+            role: "system",
+            content: "Main {{char.name}}",
+            injection_position: 1,
+            injection_depth: 1,
+            injection_order: 100,
+          },
+          {
+            identifier: "nsfw",
+            role: "system",
+            content: "Before main",
+          },
+          {
+            identifier: "jailbreak",
+            role: "assistant",
+            content: "After main",
+          },
+        ],
+        prompt_order: [
+          {
+            character_id: 100001,
+            order: [
+              { identifier: "nsfw", enabled: true },
+              { identifier: "main", enabled: true },
+              { identifier: "chatHistory", enabled: true },
+              { identifier: "jailbreak", enabled: true },
+            ],
+          },
+        ],
+      },
+      fileName: "Default.json",
+      sensitiveImportMode: "keep",
+    });
+
+    const resolved = await resolveStBaseInstructionRuntime({
+      stBase,
+      context: {
+        char: { name: "Lilly" },
+        user: { name: "Dima" },
+        chat: {},
+        messages: [],
+        rag: {},
+        art: {},
+        now: new Date("2026-02-13T00:00:00.000Z").toISOString(),
+      },
+    });
+
+    expect(resolved.systemPrompt).toBe("");
+    expect(resolved.preHistorySystemMessages).toEqual([]);
+    expect(resolved.postHistorySystemMessages).toEqual([]);
+    expect(resolved.depthInsertions).toEqual([
+      { depth: 1, role: "system", order: 100, content: "Before main" },
+      { depth: 1, role: "system", order: 100, content: "Main Lilly" },
+      { depth: 1, role: "assistant", order: 100, content: "After main" },
+    ]);
+  });
 });
diff --git a/server/src/services/chat-core/prompt-draft-builder.test.ts b/server/src/services/chat-core/prompt-draft-builder.test.ts
index ca3b3141..7fc765fc 100644
--- a/server/src/services/chat-core/prompt-draft-builder.test.ts
+++ b/server/src/services/chat-core/prompt-draft-builder.test.ts
@@ -81,8 +81,8 @@ describe("prompt-draft-builder depth insertions", () => {
       branchId: "branch",
       systemPrompt: "SYS",
       depthInsertions: [
-        { depth: 1, role: "system", content: "S1" },
-        { depth: 2, role: "assistant", content: "A2" },
+        { depth: 1, role: "system", order: 100, content: "S1" },
+        { depth: 2, role: "assistant", order: 100, content: "A2" },
       ],
     });
 
@@ -95,4 +95,36 @@ describe("prompt-draft-builder depth insertions", () => {
       { role: "user", content: "U2" },
     ]);
   });
+
+  test("orders same-depth insertions by order then role", async () => {
+    mocks.listProjectedPromptMessages.mockResolvedValue({
+      currentTurn: 2,
+      entryCount: 2,
+      messages: [
+        { role: "user", content: "U1" },
+        { role: "assistant", content: "A1" },
+      ],
+    });
+
+    const out = await buildPromptDraft({
+      chatId: "chat",
+      branchId: "branch",
+      systemPrompt: "",
+      depthInsertions: [
+        { depth: 1, role: "system", order: 100, content: "S100" },
+        { depth: 1, role: "assistant", order: 100, content: "A100" },
+        { depth: 1, role: "user", order: 100, content: "U100" },
+        { depth: 1, role: "assistant", order: 10, content: "A010" },
+      ],
+    });
+
+    expect(out.draft.messages).toEqual([
+      { role: "user", content: "U1" },
+      { role: "assistant", content: "A010" },
+      { role: "assistant", content: "A100" },
+      { role: "user", content: "U100" },
+      { role: "system", content: "S100" },
+      { role: "assistant", content: "A1" },
+    ]);
+  });
 });
diff --git a/server/src/services/chat-core/prompt-draft-builder.ts b/server/src/services/chat-core/prompt-draft-builder.ts
index 114ae0ba..52d7e228 100644
--- a/server/src/services/chat-core/prompt-draft-builder.ts
+++ b/server/src/services/chat-core/prompt-draft-builder.ts
@@ -130,7 +130,7 @@ export async function buildPromptDraft(params: {
   ownerId?: string;
   chatId: string;
   branchId: string;
-  systemPrompt: string;
+  systemPrompt?: string;
   historyLimit?: number;
   excludeMessageIds?: string[];
   excludeEntryIds?: string[];
@@ -139,6 +139,7 @@ export async function buildPromptDraft(params: {
   depthInsertions?: Array<{
     depth: number;
     role: "system" | "user" | "assistant";
+    order?: number;
     content: string;
   }>;
   worldInfoMeta?: PromptSnapshotV1["meta"]["worldInfo"];
@@ -165,7 +166,21 @@ export async function buildPromptDraft(params: {
   // Pipelines/artifacts were removed. Keep prompt drafting minimal and deterministic.
   const systemPrompt = params.systemPrompt ?? "";
   const historyWithDepthInsertions = history.map((m) => ({ role: m.role, content: m.content }));
-  for (const insertion of params.depthInsertions ?? []) {
+  const sortedDepthInsertions = (params.depthInsertions ?? [])
+    .map((insertion, index) => ({ ...insertion, order: insertion.order ?? 100, index }))
+    .sort((left, right) => {
+      if (left.depth !== right.depth) return left.depth - right.depth;
+      if (left.order !== right.order) return left.order - right.order;
+
+      const rolePriority = { assistant: 0, user: 1, system: 2 } as const;
+      if (rolePriority[left.role] !== rolePriority[right.role]) {
+        return rolePriority[left.role] - rolePriority[right.role];
+      }
+
+      return left.index - right.index;
+    });
+
+  for (const insertion of sortedDepthInsertions) {
     const normalizedDepth =
       Number.isFinite(insertion.depth) && insertion.depth > 0
         ? Math.floor(insertion.depth)
@@ -179,7 +194,9 @@ export async function buildPromptDraft(params: {
 
   const draft: PromptDraft = {
     messages: [
-      { role: "system", content: systemPrompt },
+      ...(systemPrompt.trim()
+        ? [{ role: "system" as const, content: systemPrompt }]
+        : []),
       ...(params.preHistorySystemMessages ?? []).map((content) => ({
         role: "system" as const,
         content,
diff --git a/server/src/services/chat-core/st-prompt-runtime.ts b/server/src/services/chat-core/st-prompt-runtime.ts
new file mode 100644
index 00000000..07a8d221
--- /dev/null
+++ b/server/src/services/chat-core/st-prompt-runtime.ts
@@ -0,0 +1,260 @@
+import {
+  ST_PROMPT_DEFAULT_DEPTH,
+  ST_PROMPT_DEFAULT_ORDER,
+  ST_PROMPT_INJECTION_POSITION,
+} from "@shared/types/instructions";
+import { SILLY_TAVERN_PREFERRED_CHARACTER_ID } from "@shared/utils/sillytavern-preset";
+import { cloneStPromptWithDefaults } from "@shared/utils/st-prompts";
+
+import { renderLiquidTemplate } from "./prompt-template-renderer";
+
+import type { InstructionRenderContext } from "./prompt-template-renderer";
+import type {
+  StBaseConfig,
+  StBasePromptOrder,
+  StBaseResponseConfig,
+} from "@shared/types/instructions";
+
+type ResolvedDepthInsertion = {
+  depth: number;
+  role: "system" | "user" | "assistant";
+  order: number;
+  content: string;
+};
+
+export type ResolvedStBaseInstruction = {
+  systemPrompt: string;
+  preHistorySystemMessages: string[];
+  postHistorySystemMessages: string[];
+  depthInsertions: ResolvedDepthInsertion[];
+  derivedSettings: Record<string, unknown>;
+  usedPromptIdentifiers: string[];
+};
+
+function resolvePreferredPromptOrderEntries(
+  promptOrder: StBasePromptOrder[]
+): Array<{ identifier: string; enabled: boolean }> {
+  if (promptOrder.length === 0) return [];
+  const preferred =
+    promptOrder.find(
+      (item) => item.character_id === SILLY_TAVERN_PREFERRED_CHARACTER_ID
+    ) ?? promptOrder[0];
+  return preferred.order;
+}
+
+function resolveDynamicPromptContent(params: {
+  identifier: string;
+  context: InstructionRenderContext;
+}): string {
+  const context = params.context;
+  const firstMessageExample =
+    typeof context.mesExamples === "string"
+      ? context.mesExamples
+      : typeof context.mesExamplesRaw === "string"
+        ? context.mesExamplesRaw
+        : "";
+
+  switch (params.identifier) {
+    case "worldInfoBefore":
+      return context.wiBefore ?? context.loreBefore ?? context.anchorBefore ?? "";
+    case "worldInfoAfter":
+      return context.wiAfter ?? context.loreAfter ?? context.anchorAfter ?? "";
+    case "charDescription":
+      return context.description ?? "";
+    case "charPersonality":
+      return context.personality ?? "";
+    case "scenario":
+      return context.scenario ?? "";
+    case "personaDescription":
+      return context.persona ?? "";
+    case "dialogueExamples":
+      return firstMessageExample;
+    default:
+      return "";
+  }
+}
+
+function toGatewaySettingsFromResponseConfig(
+  config: StBaseResponseConfig
+): Record<string, unknown> {
+  const settings: Record<string, unknown> = {};
+
+  if (typeof config.temperature === "number") settings.temperature = config.temperature;
+  if (typeof config.top_p === "number") settings.top_p = config.top_p;
+  if (typeof config.top_k === "number") settings.top_k = config.top_k;
+  if (typeof config.top_a === "number") settings.top_a = config.top_a;
+  if (typeof config.min_p === "number") settings.min_p = config.min_p;
+  if (typeof config.repetition_penalty === "number") {
+    settings.repetition_penalty = config.repetition_penalty;
+  }
+  if (typeof config.frequency_penalty === "number") {
+    settings.frequency_penalty = config.frequency_penalty;
+  }
+  if (typeof config.presence_penalty === "number") {
+    settings.presence_penalty = config.presence_penalty;
+  }
+  if (typeof config.openai_max_tokens === "number") {
+    settings.maxTokens = config.openai_max_tokens;
+  }
+  if (typeof config.seed === "number") settings.seed = config.seed;
+  if (typeof config.n === "number") settings.n = config.n;
+  if (typeof config.reasoning_effort === "string") {
+    settings.reasoning_effort = config.reasoning_effort;
+  }
+  if (typeof config.verbosity === "string") settings.verbosity = config.verbosity;
+  if (typeof config.enable_web_search === "boolean") {
+    settings.enable_web_search = config.enable_web_search;
+  }
+  if (typeof config.stream_openai === "boolean") {
+    settings.stream = config.stream_openai;
+  }
+
+  return settings;
+}
+
+async function renderPromptContent(params: {
+  identifier: string;
+  stBase: StBaseConfig;
+  context: InstructionRenderContext;
+}): Promise<{
+  content: string;
+  role: "system" | "user" | "assistant";
+  absolute: boolean;
+  depth: number;
+  order: number;
+} | null> {
+  const prompt = cloneStPromptWithDefaults(
+    params.stBase.prompts.find((item) => item.identifier === params.identifier) ?? {
+      identifier: params.identifier,
+    }
+  );
+
+  const rawContent =
+    typeof prompt.content === "string" && prompt.content.trim().length > 0
+      ? prompt.content
+      : resolveDynamicPromptContent({
+          identifier: params.identifier,
+          context: params.context,
+        });
+
+  if (!rawContent.trim()) return null;
+
+  const rendered = await renderLiquidTemplate({
+    templateText: rawContent,
+    context: params.context,
+  });
+  const content = rendered.trim();
+  if (!content) return null;
+
+  return {
+    content,
+    role: prompt.role ?? "system",
+    absolute:
+      prompt.injection_position === ST_PROMPT_INJECTION_POSITION.IN_CHAT,
+    depth: prompt.injection_depth ?? ST_PROMPT_DEFAULT_DEPTH,
+    order: prompt.injection_order ?? ST_PROMPT_DEFAULT_ORDER,
+  };
+}
+
+export async function resolveStBaseInstructionRuntime(params: {
+  stBase: StBaseConfig;
+  context: InstructionRenderContext;
+}): Promise<ResolvedStBaseInstruction> {
+  const selectedOrder = resolvePreferredPromptOrderEntries(
+    params.stBase.promptOrder
+  );
+  const fallbackOrder =
+    selectedOrder.length > 0
+      ? selectedOrder
+      : params.stBase.prompts.map((item) => ({
+          identifier: item.identifier,
+          enabled: true,
+        }));
+
+  const mainOrderIndex = fallbackOrder.findIndex(
+    (item) => item.enabled && item.identifier === "main"
+  );
+  const mainPrompt =
+    mainOrderIndex >= 0
+      ? cloneStPromptWithDefaults(
+          params.stBase.prompts.find((item) => item.identifier === "main") ?? {
+            identifier: "main",
+          }
+        )
+      : null;
+  const mainIsAbsolute =
+    mainPrompt?.injection_position === ST_PROMPT_INJECTION_POSITION.IN_CHAT;
+
+  const preHistory: string[] = [];
+  const postHistory: string[] = [];
+  const depthInsertions: ResolvedDepthInsertion[] = [];
+  const usedPromptIdentifiers: string[] = [];
+  let afterHistory = false;
+
+  for (const orderEntry of fallbackOrder) {
+    if (!orderEntry.enabled) continue;
+    const identifier = orderEntry.identifier;
+
+    if (identifier === "chatHistory") {
+      afterHistory = true;
+      usedPromptIdentifiers.push(identifier);
+      continue;
+    }
+
+    const rendered = await renderPromptContent({
+      identifier,
+      stBase: params.stBase,
+      context: params.context,
+    });
+    if (!rendered) continue;
+    usedPromptIdentifiers.push(identifier);
+
+    if (mainIsAbsolute && !rendered.absolute && mainPrompt) {
+      depthInsertions.push({
+        depth: mainPrompt.injection_depth ?? ST_PROMPT_DEFAULT_DEPTH,
+        role: rendered.role,
+        order: mainPrompt.injection_order ?? ST_PROMPT_DEFAULT_ORDER,
+        content: rendered.content,
+      });
+      continue;
+    }
+
+    if (rendered.absolute) {
+      depthInsertions.push({
+        depth: rendered.depth,
+        role: rendered.role,
+        order: rendered.order,
+        content: rendered.content,
+      });
+      continue;
+    }
+
+    if (afterHistory) postHistory.push(rendered.content);
+    else preHistory.push(rendered.content);
+  }
+
+  let systemPrompt = "";
+  let preHistorySystemMessages: string[] = [];
+  let postHistorySystemMessages = [...postHistory];
+
+  if (!mainIsAbsolute) {
+    if (preHistory.length > 0) {
+      systemPrompt = preHistory[0];
+      preHistorySystemMessages = preHistory.slice(1);
+    } else if (postHistory.length > 0) {
+      systemPrompt = postHistory[0];
+      postHistorySystemMessages = postHistory.slice(1);
+    }
+  }
+
+  return {
+    systemPrompt,
+    preHistorySystemMessages,
+    postHistorySystemMessages,
+    depthInsertions,
+    derivedSettings: toGatewaySettingsFromResponseConfig(
+      params.stBase.responseConfig
+    ),
+    usedPromptIdentifiers,
+  };
+}
diff --git a/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts b/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts
index fe5f8359..a0fed87c 100644
--- a/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts
+++ b/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts
@@ -212,7 +212,7 @@ describe("buildBasePrompt world-info integration", () => {
     });
   });
 
-  test("fails when selected st_base instruction has no resolvable system prompt", async () => {
+  test("allows st_base instruction with only in-chat prompts", async () => {
     mocks.pickInstructionForChat.mockResolvedValue({
       id: "tpl-1",
       ownerId: "global",
@@ -221,7 +221,15 @@ describe("buildBasePrompt world-info integration", () => {
       engine: "liquidjs",
       stBase: {
         rawPreset: {},
-        prompts: [{ identifier: "main", content: "" }],
+        prompts: [
+          {
+            identifier: "main",
+            content: "Main {{char.name}}",
+            injection_position: 1,
+            injection_depth: 1,
+            injection_order: 100,
+          },
+        ],
         promptOrder: [
           {
             character_id: 100001,
@@ -240,7 +248,7 @@ describe("buildBasePrompt world-info integration", () => {
       updatedAt: new Date(),
     });
     mocks.buildInstructionRenderContext.mockResolvedValue({
-      char: {},
+      char: { name: "Lilly" },
       user: {},
       chat: {},
       messages: [],
@@ -248,17 +256,26 @@ describe("buildBasePrompt world-info integration", () => {
       art: {},
       now: new Date().toISOString(),
     });
-    mocks.renderLiquidTemplate.mockResolvedValue("");
+    mocks.renderLiquidTemplate.mockImplementation(
+      async ({ templateText, context }: { templateText: string; context: Record<string, unknown> }) =>
+        templateText.replace("{{char.name}}", String((context.char as { name?: string })?.name ?? ""))
+    );
+
+    const out = await buildBasePrompt({
+      ownerId: "global",
+      chatId: "chat",
+      branchId: "branch",
+      entityProfileId: "entity",
+      historyLimit: 50,
+      trigger: "generate",
+    });
 
-    await expect(
-      buildBasePrompt({
-        ownerId: "global",
-        chatId: "chat",
-        branchId: "branch",
-        entityProfileId: "entity",
-        historyLimit: 50,
-        trigger: "generate",
+    expect(mocks.buildPromptDraft).toHaveBeenCalledWith(
+      expect.objectContaining({
+        systemPrompt: "",
+        depthInsertions: [{ depth: 1, role: "system", order: 100, content: "Main Lilly" }],
       })
-    ).rejects.toThrow("st_base instruction did not resolve a system prompt");
+    );
+    expect(out.prompt.systemPrompt).toBe("");
   });
 });
diff --git a/server/src/services/chat-generation-v3/prompt/build-base-prompt.ts b/server/src/services/chat-generation-v3/prompt/build-base-prompt.ts
index cb2d9fa8..76d147e5 100644
--- a/server/src/services/chat-generation-v3/prompt/build-base-prompt.ts
+++ b/server/src/services/chat-generation-v3/prompt/build-base-prompt.ts
@@ -82,6 +82,14 @@ export async function buildBasePrompt(params: {
   let systemPrompt = DEFAULT_SYSTEM_PROMPT;
   let preHistorySystemMessages: string[] = [];
   let postHistorySystemMessages: string[] = [];
+  let depthInsertions:
+    | Array<{
+        depth: number;
+        role: "system" | "user" | "assistant";
+        order: number;
+        content: string;
+      }>
+    | undefined;
   let instructionDerivedSettings: Record<string, unknown> = {};
   const template = await pickInstructionForChat({
     ownerId: params.ownerId,
@@ -96,6 +104,10 @@ export async function buildBasePrompt(params: {
       systemPrompt = resolved.systemPrompt;
       preHistorySystemMessages = resolved.preHistorySystemMessages;
       postHistorySystemMessages = resolved.postHistorySystemMessages;
+      depthInsertions =
+        resolved.depthInsertions.length > 0
+          ? resolved.depthInsertions
+          : undefined;
       instructionDerivedSettings = resolved.derivedSettings;
     } else {
       const rendered = await renderLiquidTemplate({
@@ -116,6 +128,7 @@ export async function buildBasePrompt(params: {
       preHistorySystemMessages.length > 0 ? preHistorySystemMessages : undefined,
     postHistorySystemMessages:
       postHistorySystemMessages.length > 0 ? postHistorySystemMessages : undefined,
+    depthInsertions,
     historyLimit: params.historyLimit,
     excludeMessageIds: params.excludeMessageIds,
     excludeEntryIds: params.excludeEntryIds,
diff --git a/shared/types/instructions.ts b/shared/types/instructions.ts
index 90794111..0ac3a2ea 100644
--- a/shared/types/instructions.ts
+++ b/shared/types/instructions.ts
@@ -5,6 +5,15 @@ export type InstructionMeta = {
 };
 
 export type StBasePromptRole = "system" | "user" | "assistant";
+export type StBasePromptInjectionPosition = 0 | 1;
+
+export const ST_PROMPT_INJECTION_POSITION = {
+  RELATIVE: 0,
+  IN_CHAT: 1,
+} as const satisfies Record<string, StBasePromptInjectionPosition>;
+
+export const ST_PROMPT_DEFAULT_DEPTH = 4;
+export const ST_PROMPT_DEFAULT_ORDER = 100;
 
 export type StBasePrompt = {
   identifier: string;
@@ -13,6 +22,9 @@ export type StBasePrompt = {
   content?: string;
   system_prompt?: boolean;
   marker?: boolean;
+  injection_position?: StBasePromptInjectionPosition;
+  injection_depth?: number;
+  injection_order?: number;
 };
 
 export type StBasePromptOrderEntry = {
diff --git a/shared/utils/st-prompts.ts b/shared/utils/st-prompts.ts
new file mode 100644
index 00000000..cc2180b7
--- /dev/null
+++ b/shared/utils/st-prompts.ts
@@ -0,0 +1,156 @@
+import {
+  ST_PROMPT_DEFAULT_DEPTH,
+  ST_PROMPT_DEFAULT_ORDER,
+  ST_PROMPT_INJECTION_POSITION,
+} from "../types/instructions";
+
+import type {
+  StBasePrompt,
+  StBasePromptInjectionPosition,
+  StBasePromptOrder,
+  StBasePromptRole,
+} from "../types/instructions";
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function asString(value: unknown): string | null {
+  if (typeof value !== "string") return null;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function toNonNegativeInteger(
+  value: unknown,
+  fallback: number
+): number {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    return fallback;
+  }
+  return Math.floor(value);
+}
+
+export function normalizeStPromptRole(
+  value: unknown
+): StBasePromptRole | undefined {
+  if (value === "system" || value === "user" || value === "assistant") {
+    return value;
+  }
+  return undefined;
+}
+
+export function normalizeStPromptInjectionPosition(
+  value: unknown
+): StBasePromptInjectionPosition {
+  return value === ST_PROMPT_INJECTION_POSITION.IN_CHAT
+    ? ST_PROMPT_INJECTION_POSITION.IN_CHAT
+    : ST_PROMPT_INJECTION_POSITION.RELATIVE;
+}
+
+export function normalizeStPrompt(
+  value: unknown
+): StBasePrompt | null {
+  if (!isRecord(value)) return null;
+  const identifier = asString(value.identifier);
+  if (!identifier) return null;
+
+  const prompt: StBasePrompt = {
+    identifier,
+    injection_position: normalizeStPromptInjectionPosition(
+      value.injection_position
+    ),
+    injection_depth: toNonNegativeInteger(
+      value.injection_depth,
+      ST_PROMPT_DEFAULT_DEPTH
+    ),
+    injection_order: toNonNegativeInteger(
+      value.injection_order,
+      ST_PROMPT_DEFAULT_ORDER
+    ),
+  };
+
+  const name = asString(value.name);
+  if (name) prompt.name = name;
+
+  const role = normalizeStPromptRole(value.role);
+  if (role) prompt.role = role;
+
+  if (typeof value.content === "string") prompt.content = value.content;
+  if (typeof value.system_prompt === "boolean") {
+    prompt.system_prompt = value.system_prompt;
+  }
+  if (typeof value.marker === "boolean") {
+    prompt.marker = value.marker;
+  }
+
+  return prompt;
+}
+
+export function normalizeStPrompts(input: unknown): StBasePrompt[] {
+  if (!Array.isArray(input)) return [];
+  return input
+    .map(normalizeStPrompt)
+    .filter((item): item is StBasePrompt => Boolean(item));
+}
+
+export function cloneStPromptWithDefaults(prompt: StBasePrompt): StBasePrompt {
+  return {
+    ...prompt,
+    injection_position: normalizeStPromptInjectionPosition(
+      prompt.injection_position
+    ),
+    injection_depth: toNonNegativeInteger(
+      prompt.injection_depth,
+      ST_PROMPT_DEFAULT_DEPTH
+    ),
+    injection_order: toNonNegativeInteger(
+      prompt.injection_order,
+      ST_PROMPT_DEFAULT_ORDER
+    ),
+  };
+}
+
+export function normalizeStPromptOrderEntry(
+  value: unknown
+): { identifier: string; enabled: boolean } | null {
+  if (!isRecord(value)) return null;
+  const identifier = asString(value.identifier);
+  if (!identifier) return null;
+  return {
+    identifier,
+    enabled: typeof value.enabled === "boolean" ? value.enabled : true,
+  };
+}
+
+export function normalizeStPromptOrderItem(
+  value: unknown
+): StBasePromptOrder | null {
+  if (!isRecord(value)) return null;
+  const rawCharacterId = value.character_id;
+  const characterId =
+    typeof rawCharacterId === "number" && Number.isFinite(rawCharacterId)
+      ? Math.floor(rawCharacterId)
+      : null;
+  if (characterId === null) return null;
+
+  const rawOrder = Array.isArray(value.order) ? value.order : [];
+  const order = rawOrder
+    .map(normalizeStPromptOrderEntry)
+    .filter(
+      (entry): entry is { identifier: string; enabled: boolean } =>
+        Boolean(entry)
+    );
+
+  return {
+    character_id: characterId,
+    order,
+  };
+}
+
+export function normalizeStPromptOrder(input: unknown): StBasePromptOrder[] {
+  if (!Array.isArray(input)) return [];
+  return input
+    .map(normalizeStPromptOrderItem)
+    .filter((item): item is StBasePromptOrder => Boolean(item));
+}
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-editor-modal.tsx b/web/src/features/sidebars/instructions/st-prompt-block-editor-modal.tsx
index cd5b9172..78fffed8 100644
--- a/web/src/features/sidebars/instructions/st-prompt-block-editor-modal.tsx
+++ b/web/src/features/sidebars/instructions/st-prompt-block-editor-modal.tsx
@@ -83,6 +83,9 @@ export function StPromptBlockEditorModal({
 								name: draft.name,
 								role: draft.role,
 								content: draft.content,
+								injectionPosition: draft.injectionPosition,
+								injectionDepth: draft.injectionDepth,
+								injectionOrder: draft.injectionOrder,
 							}}
 							contentReadOnly={draft.contentReadOnly}
 							onChange={(patch) =>
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-editor-state.test.ts b/web/src/features/sidebars/instructions/st-prompt-block-editor-state.test.ts
index 9a43fbec..e5f51e0e 100644
--- a/web/src/features/sidebars/instructions/st-prompt-block-editor-state.test.ts
+++ b/web/src/features/sidebars/instructions/st-prompt-block-editor-state.test.ts
@@ -55,6 +55,9 @@ describe('st prompt block editor state', () => {
 				system_prompt: false,
 				marker: true,
 				content: 'Body',
+				injection_position: 1,
+				injection_depth: 3,
+				injection_order: 120,
 			},
 			contentReadOnly: false,
 		});
@@ -70,6 +73,9 @@ describe('st prompt block editor state', () => {
 				name: undefined,
 				role: 'assistant',
 				content: 'Updated body',
+				injection_position: 1,
+				injection_depth: 3,
+				injection_order: 120,
 			},
 		});
 	});
@@ -82,6 +88,9 @@ describe('st prompt block editor state', () => {
 				role: 'system',
 				system_prompt: true,
 				content: 'Body',
+				injection_position: 0,
+				injection_depth: 4,
+				injection_order: 100,
 			},
 			contentReadOnly: true,
 		});
@@ -89,4 +98,24 @@ describe('st prompt block editor state', () => {
 		expect(areStPromptBlockEditorStatesEqual(draft, { ...draft })).toBe(true);
 		expect(areStPromptBlockEditorStatesEqual(draft, { ...draft, contentReadOnly: false })).toBe(false);
 	});
+
+	it('tracks injection fields in equality', () => {
+		const draft = createStPromptBlockEditorState({
+			prompt: {
+				identifier: 'main',
+				name: 'Main prompt',
+				role: 'system',
+				system_prompt: true,
+				content: 'Body',
+				injection_position: 0,
+				injection_depth: 4,
+				injection_order: 100,
+			},
+			contentReadOnly: false,
+		});
+
+		expect(areStPromptBlockEditorStatesEqual(draft, { ...draft, injectionPosition: 1 })).toBe(false);
+		expect(areStPromptBlockEditorStatesEqual(draft, { ...draft, injectionDepth: 2 })).toBe(false);
+		expect(areStPromptBlockEditorStatesEqual(draft, { ...draft, injectionOrder: 90 })).toBe(false);
+	});
 });
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-editor-state.ts b/web/src/features/sidebars/instructions/st-prompt-block-editor-state.ts
index 904c49d3..2383bf0d 100644
--- a/web/src/features/sidebars/instructions/st-prompt-block-editor-state.ts
+++ b/web/src/features/sidebars/instructions/st-prompt-block-editor-state.ts
@@ -5,11 +5,17 @@ export type StPromptBlockEditorState = {
 	name: string;
 	role: 'system' | 'user' | 'assistant';
 	content: string;
+	injectionPosition: 0 | 1;
+	injectionDepth: number;
+	injectionOrder: number;
 	contentReadOnly: boolean;
 };
 
 export type StPromptBlockEditorSavePlan = {
-	promptPatch: Pick<StBasePrompt, 'name' | 'role' | 'content'>;
+	promptPatch: Pick<
+		StBasePrompt,
+		'name' | 'role' | 'content' | 'injection_position' | 'injection_depth' | 'injection_order'
+	>;
 };
 
 type CreateStateParams = {
@@ -23,6 +29,9 @@ export function createStPromptBlockEditorState(params: CreateStateParams): StPro
 		name: params.prompt.name ?? params.prompt.identifier,
 		role: params.prompt.role ?? 'system',
 		content: params.prompt.content ?? '',
+		injectionPosition: params.prompt.injection_position ?? 0,
+		injectionDepth: params.prompt.injection_depth ?? 4,
+		injectionOrder: params.prompt.injection_order ?? 100,
 		contentReadOnly: params.contentReadOnly,
 	};
 }
@@ -36,6 +45,9 @@ export function areStPromptBlockEditorStatesEqual(
 		left.name === right.name &&
 		left.role === right.role &&
 		left.content === right.content &&
+		left.injectionPosition === right.injectionPosition &&
+		left.injectionDepth === right.injectionDepth &&
+		left.injectionOrder === right.injectionOrder &&
 		left.contentReadOnly === right.contentReadOnly
 	);
 }
@@ -55,6 +67,9 @@ export function createStPromptBlockEditorSavePlan(
 			name: state.name.trim() || undefined,
 			role: state.role,
 			content: state.content,
+			injection_position: state.injectionPosition,
+			injection_depth: state.injectionDepth,
+			injection_order: state.injectionOrder,
 		},
 	};
 }
diff --git a/web/src/features/sidebars/instructions/st-prompt-block-form-fields.tsx b/web/src/features/sidebars/instructions/st-prompt-block-form-fields.tsx
index 701cdeb9..17afba02 100644
--- a/web/src/features/sidebars/instructions/st-prompt-block-form-fields.tsx
+++ b/web/src/features/sidebars/instructions/st-prompt-block-form-fields.tsx
@@ -1,8 +1,15 @@
-import { Group, Select, TextInput, Textarea } from '@mantine/core';
+import { Group, NumberInput, Select, TextInput, Textarea } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 
 import type { PromptBlockFields } from './st-prompt-blocks';
 
+function toNonNegativeInteger(value: string | number | undefined, fallback: number): number {
+	if (typeof value === 'number' && Number.isFinite(value) && value >= 0) {
+		return Math.floor(value);
+	}
+	return fallback;
+}
+
 type StPromptBlockFormFieldsProps = {
 	value: PromptBlockFields;
 	contentReadOnly?: boolean;
@@ -42,6 +49,43 @@ export function StPromptBlockFormFields({
 				/>
 			</Group>
 
+			<Group grow align="flex-start">
+				<Select
+					label={t('instructions.fields.promptPosition')}
+					description={t('instructions.fields.promptPositionDescription')}
+					value={String(value.injectionPosition)}
+					onChange={(nextPosition) =>
+						onChange({
+							injectionPosition: (Number(nextPosition) === 1 ? 1 : 0) as PromptBlockFields['injectionPosition'],
+						})
+					}
+					data={[
+						{ value: '0', label: t('instructions.fields.promptPositionRelative') },
+						{ value: '1', label: t('instructions.fields.promptPositionInChat') },
+					]}
+					allowDeselect={false}
+				/>
+				{value.injectionPosition === 1 ? (
+					<NumberInput
+						label={t('instructions.fields.promptDepth')}
+						description={t('instructions.fields.promptDepthDescription')}
+						min={0}
+						value={value.injectionDepth}
+						onChange={(nextValue) => onChange({ injectionDepth: toNonNegativeInteger(nextValue, value.injectionDepth) })}
+					/>
+				) : null}
+			</Group>
+
+			{value.injectionPosition === 1 ? (
+				<NumberInput
+					label={t('instructions.fields.promptOrder')}
+					description={t('instructions.fields.promptOrderDescription')}
+					min={0}
+					value={value.injectionOrder}
+					onChange={(nextValue) => onChange({ injectionOrder: toNonNegativeInteger(nextValue, value.injectionOrder) })}
+				/>
+			) : null}
+
 			<Textarea
 				label={t('instructions.fields.promptContent')}
 				value={value.content}
diff --git a/web/src/features/sidebars/instructions/st-prompt-blocks.test.ts b/web/src/features/sidebars/instructions/st-prompt-blocks.test.ts
index 74ef19bd..7ea9654e 100644
--- a/web/src/features/sidebars/instructions/st-prompt-blocks.test.ts
+++ b/web/src/features/sidebars/instructions/st-prompt-blocks.test.ts
@@ -14,6 +14,9 @@ describe('st prompt blocks helpers', () => {
 			name: 'Author Note',
 			role: 'system',
 			content: 'Body',
+			injectionPosition: 0,
+			injectionDepth: 4,
+			injectionOrder: 100,
 		});
 
 		expect(prompt.identifier).toMatch(
@@ -27,6 +30,9 @@ describe('st prompt blocks helpers', () => {
 				name: 'Author Note',
 				role: 'assistant',
 				content: 'Body',
+				injectionPosition: 1,
+				injectionDepth: 6,
+				injectionOrder: 80,
 			},
 			() => 'generated-uuid',
 		);
@@ -38,6 +44,9 @@ describe('st prompt blocks helpers', () => {
 			system_prompt: true,
 			marker: false,
 			content: 'Body',
+			injection_position: 1,
+			injection_depth: 6,
+			injection_order: 80,
 		});
 	});
 
@@ -73,6 +82,9 @@ describe('st prompt blocks helpers', () => {
 			name: 'Main Prompt',
 			role: 'system',
 			system_prompt: true,
+			injection_position: 0,
+			injection_depth: 4,
+			injection_order: 100,
 		});
 
 		expect(normalizePromptForEdit(undefined, 'custom-id')).toEqual({
@@ -81,6 +93,9 @@ describe('st prompt blocks helpers', () => {
 			role: 'system',
 			system_prompt: true,
 			content: '',
+			injection_position: 0,
+			injection_depth: 4,
+			injection_order: 100,
 		});
 	});
 
@@ -89,6 +104,9 @@ describe('st prompt blocks helpers', () => {
 			name: '',
 			role: 'system',
 			content: '',
+			injectionPosition: 0,
+			injectionDepth: 4,
+			injectionOrder: 100,
 		});
 	});
 });
diff --git a/web/src/features/sidebars/instructions/st-prompt-blocks.ts b/web/src/features/sidebars/instructions/st-prompt-blocks.ts
index b71ee1a8..1eddc27d 100644
--- a/web/src/features/sidebars/instructions/st-prompt-blocks.ts
+++ b/web/src/features/sidebars/instructions/st-prompt-blocks.ts
@@ -1,3 +1,9 @@
+import {
+	ST_PROMPT_DEFAULT_DEPTH,
+	ST_PROMPT_DEFAULT_ORDER,
+	ST_PROMPT_INJECTION_POSITION,
+} from '@shared/types/instructions';
+import { cloneStPromptWithDefaults } from '@shared/utils/st-prompts';
 import { v4 as uuidv4 } from 'uuid';
 
 import { getStPromptDefinition, getStPromptSourceLabel, ST_SYSTEM_PROMPT_DEFAULTS } from '@model/instructions/st-preset';
@@ -12,6 +18,9 @@ export type PromptBlockFields = {
 	name: string;
 	role: PromptBlockRole;
 	content: string;
+	injectionPosition: 0 | 1;
+	injectionDepth: number;
+	injectionOrder: number;
 };
 
 export function createEmptyPromptBlockFields(): PromptBlockFields {
@@ -19,22 +28,25 @@ export function createEmptyPromptBlockFields(): PromptBlockFields {
 		name: '',
 		role: 'system',
 		content: '',
+		injectionPosition: ST_PROMPT_INJECTION_POSITION.RELATIVE,
+		injectionDepth: ST_PROMPT_DEFAULT_DEPTH,
+		injectionOrder: ST_PROMPT_DEFAULT_ORDER,
 	};
 }
 
 export function normalizePromptForEdit(prompt: StBasePrompt | undefined, identifier: string): StBasePrompt {
-	if (prompt) return { ...prompt };
+	if (prompt) return cloneStPromptWithDefaults(prompt);
 
 	const definition = getStPromptDefinition(identifier);
-	if (definition) return { ...definition };
+	if (definition) return cloneStPromptWithDefaults(definition);
 
-	return {
+	return cloneStPromptWithDefaults({
 		identifier,
 		name: identifier,
 		role: 'system',
 		system_prompt: true,
 		content: '',
-	};
+	});
 }
 
 export function canDeletePrompt(identifier: string): boolean {
@@ -49,12 +61,15 @@ export function createCustomPrompt(
 	fields: PromptBlockFields,
 	createIdentifier: () => string = uuidv4,
 ): StBasePrompt {
-	return {
+	return cloneStPromptWithDefaults({
 		identifier: createIdentifier(),
 		name: fields.name.trim() || undefined,
 		role: fields.role,
 		system_prompt: true,
 		marker: false,
 		content: fields.content,
-	};
+		injection_position: fields.injectionPosition,
+		injection_depth: fields.injectionDepth,
+		injection_order: fields.injectionOrder,
+	});
 }
diff --git a/web/src/i18n/resources/en/instructions.ts b/web/src/i18n/resources/en/instructions.ts
index 19d72b01..a8c27733 100644
--- a/web/src/i18n/resources/en/instructions.ts
+++ b/web/src/i18n/resources/en/instructions.ts
@@ -45,6 +45,14 @@ const enInstructions = {
 		promptBlocks: 'Prompt blocks',
 		promptName: 'Block name',
 		promptRole: 'Role',
+		promptPosition: 'Position',
+		promptPositionDescription: 'Relative keeps the block alongside other preset prompts, In-chat injects it into chat by depth.',
+		promptPositionRelative: 'Relative',
+		promptPositionInChat: 'In-chat',
+		promptDepth: 'Depth',
+		promptDepthDescription: '0 = after the last message, 1 = before the last message, etc.',
+		promptOrder: 'Order',
+		promptOrderDescription: 'Ordered from low/top to high/bottom; at the same order: Assistant, User, System.',
 		promptContent: 'Block content',
 		importSource: 'Import source',
 		importFileName: 'Imported file',
diff --git a/web/src/i18n/resources/ru/instructions.ts b/web/src/i18n/resources/ru/instructions.ts
index 3464402c..ba007fd0 100644
--- a/web/src/i18n/resources/ru/instructions.ts
+++ b/web/src/i18n/resources/ru/instructions.ts
@@ -45,6 +45,14 @@ const ruInstructions = {
 		promptBlocks: 'Блоки промпта',
 		promptName: 'Название блока',
 		promptRole: 'Role',
+		promptPosition: 'Position',
+		promptPositionDescription: 'Relative добавляется рядом с остальными блоками пресета, In-chat вставляется в чат по глубине.',
+		promptPositionRelative: 'Relative',
+		promptPositionInChat: 'In-chat',
+		promptDepth: 'Depth',
+		promptDepthDescription: '0 = после последнего сообщения, 1 = перед последним сообщением и т.д.',
+		promptOrder: 'Order',
+		promptOrderDescription: 'От меньшего/сверху к большему/снизу; при одинаковом order: Assistant, User, System.',
 		promptContent: 'Содержимое блока',
 		importSource: 'Источник импорта',
 		importFileName: 'Импортированный файл',
diff --git a/web/src/model/instructions/st-preset-prompts.ts b/web/src/model/instructions/st-preset-prompts.ts
new file mode 100644
index 00000000..8a33fb8d
--- /dev/null
+++ b/web/src/model/instructions/st-preset-prompts.ts
@@ -0,0 +1,93 @@
+import type { StBasePrompt } from '@shared/types/instructions';
+
+export const ST_SYSTEM_PROMPT_DEFAULTS: StBasePrompt[] = [
+	{
+		identifier: 'main',
+		name: 'Main Prompt',
+		system_prompt: true,
+		role: 'system',
+		content: "Write {{char}}'s next reply in a fictional chat between {{charIfNotGroup}} and {{user}}.",
+	},
+	{
+		identifier: 'nsfw',
+		name: 'Auxiliary Prompt',
+		system_prompt: true,
+		role: 'system',
+		content: '',
+	},
+	{
+		identifier: 'dialogueExamples',
+		name: 'Chat Examples',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'jailbreak',
+		name: 'Post-History Instructions',
+		system_prompt: true,
+		role: 'system',
+		content: '',
+	},
+	{
+		identifier: 'chatHistory',
+		name: 'Chat History',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'worldInfoAfter',
+		name: 'World Info (after)',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'worldInfoBefore',
+		name: 'World Info (before)',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'enhanceDefinitions',
+		name: 'Enhance Definitions',
+		system_prompt: true,
+		role: 'system',
+		content:
+			"If you have more knowledge of {{char}}, add to the character's lore and personality to enhance them but keep the Character Sheet's definitions absolute.",
+		marker: false,
+	},
+	{
+		identifier: 'charDescription',
+		name: 'Char Description',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'charPersonality',
+		name: 'Char Personality',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'scenario',
+		name: 'Scenario',
+		system_prompt: true,
+		marker: true,
+	},
+	{
+		identifier: 'personaDescription',
+		name: 'Persona Description',
+		system_prompt: true,
+		marker: true,
+	},
+];
+
+export const ST_PROMPT_SOURCE_LABELS: Partial<Record<string, string>> = {
+	charDescription: 'Character Description',
+	charPersonality: 'Character Personality',
+	scenario: 'Character Scenario',
+	personaDescription: 'Persona Description',
+	worldInfoBefore: 'World Info (before character)',
+	worldInfoAfter: 'World Info (after character)',
+	dialogueExamples: 'Dialogue Examples',
+	chatHistory: 'Chat History',
+};
diff --git a/web/src/model/instructions/st-preset.test.ts b/web/src/model/instructions/st-preset.test.ts
new file mode 100644
index 00000000..ef44376b
--- /dev/null
+++ b/web/src/model/instructions/st-preset.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildStPresetFromStBase, createStBaseConfigFromPreset } from './st-preset';
+
+describe('st-preset prompt injection fields', () => {
+	it('normalizes missing injection fields to SillyTavern defaults', () => {
+		const stBase = createStBaseConfigFromPreset({
+			preset: {
+				chat_completion_source: 'openai',
+				prompts: [{ identifier: 'main', role: 'system', content: 'Main' }],
+				prompt_order: [{ character_id: 100001, order: [{ identifier: 'main', enabled: true }] }],
+			},
+			fileName: 'Default.json',
+			sensitiveImportMode: 'keep',
+		});
+
+		expect(stBase.prompts).toEqual([
+			expect.objectContaining({
+				identifier: 'main',
+				injection_position: 0,
+				injection_depth: 4,
+				injection_order: 100,
+			}),
+		]);
+	});
+
+	it('exports injection fields back to preset prompts', () => {
+		const stBase = createStBaseConfigFromPreset({
+			preset: {
+				chat_completion_source: 'openai',
+				prompts: [
+					{
+						identifier: 'main',
+						role: 'assistant',
+						content: 'Main',
+						injection_position: 1,
+						injection_depth: 2,
+						injection_order: 70,
+					},
+				],
+				prompt_order: [{ character_id: 100001, order: [{ identifier: 'main', enabled: true }] }],
+			},
+			fileName: 'Default.json',
+			sensitiveImportMode: 'keep',
+		});
+
+		const preset = buildStPresetFromStBase(stBase);
+
+		expect(preset.prompts).toEqual([
+			expect.objectContaining({
+				identifier: 'main',
+				injection_position: 1,
+				injection_depth: 2,
+				injection_order: 70,
+			}),
+		]);
+	});
+});
diff --git a/web/src/model/instructions/st-preset.ts b/web/src/model/instructions/st-preset.ts
index f0faeea0..d28482b2 100644
--- a/web/src/model/instructions/st-preset.ts
+++ b/web/src/model/instructions/st-preset.ts
@@ -3,6 +3,15 @@ import {
 	getSillyTavernPresetValidationError,
 	SILLY_TAVERN_PREFERRED_CHARACTER_ID,
 } from '@shared/utils/sillytavern-preset';
+import {
+	cloneStPromptWithDefaults,
+	normalizeStPromptOrder,
+	normalizeStPrompts,
+} from '@shared/utils/st-prompts';
+
+import { ST_PROMPT_SOURCE_LABELS, ST_SYSTEM_PROMPT_DEFAULTS } from './st-preset-prompts';
+
+export { ST_PROMPT_SOURCE_LABELS, ST_SYSTEM_PROMPT_DEFAULTS } from './st-preset-prompts';
 
 import type {
 	StBaseConfig,
@@ -12,98 +21,6 @@ import type {
 } from '@shared/types/instructions';
 import type { LlmProviderConfig, LlmProviderId } from '@shared/types/llm';
 
-export const ST_SYSTEM_PROMPT_DEFAULTS: StBasePrompt[] = [
-	{
-		identifier: 'main',
-		name: 'Main Prompt',
-		system_prompt: true,
-		role: 'system',
-		content: "Write {{char}}'s next reply in a fictional chat between {{charIfNotGroup}} and {{user}}.",
-	},
-	{
-		identifier: 'nsfw',
-		name: 'Auxiliary Prompt',
-		system_prompt: true,
-		role: 'system',
-		content: '',
-	},
-	{
-		identifier: 'dialogueExamples',
-		name: 'Chat Examples',
-		system_prompt: true,
-		marker: true,
-	},
-	{
-		identifier: 'jailbreak',
-		name: 'Post-History Instructions',
-		system_prompt: true,
-		role: 'system',
-		content: '',
-	},
-	{
-		identifier: 'chatHistory',
-		name: 'Chat History',
-		system_prompt: true,
-		marker: true,
-	},
-	{
-		identifier: 'worldInfoAfter',
-		name: 'World Info (after)',
-		system_prompt: true,
-		marker: true,
-	},
-	{
-		identifier: 'worldInfoBefore',
-		name: 'World Info (before)',
-		system_prompt: true,
-		marker: true,
-	},
-	{
-		identifier: 'enhanceDefinitions',
-		name: 'Enhance Definitions',
-		system_prompt: true,
-		role: 'system',
-		content:
-			"If you have more knowledge of {{char}}, add to the character's lore and personality to enhance them but keep the Character Sheet's definitions absolute.",
-		marker: false,
-	},
-	{
-		identifier: 'charDescription',
-		name: 'Char Description',
-		system_prompt: true,
-		marker: true,
-	},
-	{
-		identifier: 'charPersonality',
-		name: 'Char Personality',
-		system_prompt: true,
-		marker: true,
-	},
-	{
-		identifier: 'scenario',
-		name: 'Scenario',
-		system_prompt: true,
-		marker: true,
-	},
-	{
-		identifier: 'personaDescription',
-		name: 'Persona Description',
-		system_prompt: true,
-		marker: true,
-	},
-];
-
-export const ST_PROMPT_SOURCE_LABELS: Partial<Record<string, string>> = {
-	charDescription: 'Character Description',
-	charPersonality: 'Character Personality',
-	scenario: 'Character Scenario',
-	personaDescription: 'Persona Description',
-	worldInfoBefore: 'World Info (before character)',
-	worldInfoAfter: 'World Info (after character)',
-	dialogueExamples: 'Dialogue Examples',
-	chatHistory: 'Chat History',
-};
-
 export const ST_SENSITIVE_FIELDS = [
 	'reverse_proxy',
 	'proxy_password',
@@ -177,10 +94,6 @@ export type StPresetBindingPlan = {
 	warnings: string[];
 };
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-	return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
 function asString(value: unknown): string | null {
 	if (typeof value !== 'string') return null;
 	const trimmed = value.trim();
@@ -196,65 +109,6 @@ function toOptionalBoolean(value: unknown): boolean | undefined {
 	return typeof value === 'boolean' ? value : undefined;
 }
 
-function normalizeStPromptRole(value: unknown): StBasePrompt['role'] | undefined {
-	if (value === 'system' || value === 'user' || value === 'assistant') {
-		return value;
-	}
-	return undefined;
-}
-
-function normalizePrompt(value: unknown): StBasePrompt | null {
-	if (!isRecord(value)) return null;
-	const identifier = asString(value.identifier);
-	if (!identifier) return null;
-
-	const prompt: StBasePrompt = { identifier };
-	const name = asString(value.name);
-	if (name) prompt.name = name;
-	const role = normalizeStPromptRole(value.role);
-	if (role) prompt.role = role;
-	if (typeof value.content === 'string') prompt.content = value.content;
-	if (typeof value.system_prompt === 'boolean') {
-		prompt.system_prompt = value.system_prompt;
-	}
-	if (typeof value.marker === 'boolean') {
-		prompt.marker = value.marker;
-	}
-	return prompt;
-}
-
-function normalizePromptOrderEntry(
-	value: unknown
-): { identifier: string; enabled: boolean } | null {
-	if (!isRecord(value)) return null;
-	const identifier = asString(value.identifier);
-	if (!identifier) return null;
-	return {
-		identifier,
-		enabled: typeof value.enabled === 'boolean' ? value.enabled : true,
-	};
-}
-
-function normalizePromptOrderItem(value: unknown): StBasePromptOrder | null {
-	if (!isRecord(value)) return null;
-	const rawCharacterId = value.character_id;
-	const characterId =
-		typeof rawCharacterId === 'number' && Number.isFinite(rawCharacterId)
-			? Math.floor(rawCharacterId)
-			: null;
-	if (characterId === null) return null;
-
-	const rawOrder = Array.isArray(value.order) ? value.order : [];
-	const order = rawOrder
-		.map(normalizePromptOrderEntry)
-		.filter((entry): entry is { identifier: string; enabled: boolean } => Boolean(entry));
-
-	return {
-		character_id: characterId,
-		order,
-	};
-}
-
 function normalizeResponseConfig(
 	preset: Record<string, unknown>
 ): StBaseResponseConfig {
@@ -340,18 +194,6 @@ export function stripSensitiveFieldsFromPreset(
 	return cloned;
 }
 
-export function normalizeStPrompts(input: unknown): StBasePrompt[] {
-	if (!Array.isArray(input)) return [];
-	return input.map(normalizePrompt).filter((item): item is StBasePrompt => Boolean(item));
-}
-
-export function normalizeStPromptOrder(input: unknown): StBasePromptOrder[] {
-	if (!Array.isArray(input)) return [];
-	return input
-		.map(normalizePromptOrderItem)
-		.filter((item): item is StBasePromptOrder => Boolean(item));
-}
-
 export function createStBaseConfigFromPreset(params: {
 	preset: Record<string, unknown>;
 	fileName: string;
@@ -415,7 +257,7 @@ export function getStPromptSourceLabel(identifier: string): string | null {
 
 export function buildStPresetFromStBase(stBase: StBaseConfig): Record<string, unknown> {
 	const preset = structuredClone(stBase.rawPreset ?? {});
-	preset.prompts = stBase.prompts.map((item) => ({ ...item }));
+	preset.prompts = stBase.prompts.map((item) => cloneStPromptWithDefaults(item));
 	preset.prompt_order = stBase.promptOrder.map((item) => ({
 		character_id: item.character_id,
 		order: item.order.map((orderItem) => ({ ...orderItem })),

From 66bb1295b50d3e97c1a370c1936121bd6499eca0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Thu, 9 Apr 2026 00:50:29 +0300
Subject: [PATCH 35/54] fix: improve chat world info dialog sizing and select
 search

---
 ...at-world-info-binding-dialog.model.test.ts | 36 +++++++++++++++++++
 .../chat-world-info-binding-dialog.model.ts   | 28 +++++++++++++++
 .../input/chat-world-info-binding-dialog.tsx  | 19 ++++++++--
 web/src/i18n/resources/en/chat.ts             |  1 +
 web/src/i18n/resources/ru/chat.ts             |  1 +
 5 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 web/src/features/chat-window/input/chat-world-info-binding-dialog.model.test.ts
 create mode 100644 web/src/features/chat-window/input/chat-world-info-binding-dialog.model.ts

diff --git a/web/src/features/chat-window/input/chat-world-info-binding-dialog.model.test.ts b/web/src/features/chat-window/input/chat-world-info-binding-dialog.model.test.ts
new file mode 100644
index 00000000..933aafcf
--- /dev/null
+++ b/web/src/features/chat-window/input/chat-world-info-binding-dialog.model.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+	buildChatWorldInfoBindingOptions,
+	createChatWorldInfoBindingSelectProps,
+} from './chat-world-info-binding-dialog.model';
+
+describe('chat world info binding dialog model', () => {
+	it('prepends the unbound option before world info books', () => {
+		expect(
+			buildChatWorldInfoBindingOptions({
+				noneLabel: 'Not linked',
+				books: [
+					{ id: 'book-1', name: 'Alpha' },
+					{ id: 'book-2', name: 'Beta' },
+				],
+			}),
+		).toEqual([
+			{ value: '__none__', label: 'Not linked' },
+			{ value: 'book-1', label: 'Alpha' },
+			{ value: 'book-2', label: 'Beta' },
+		]);
+	});
+
+	it('enables searchable dropdown props and renders it above the dialog', () => {
+		expect(createChatWorldInfoBindingSelectProps('No matches')).toEqual({
+			searchable: true,
+			nothingFoundMessage: 'No matches',
+			maxDropdownHeight: 320,
+			comboboxProps: {
+				withinPortal: true,
+				zIndex: 4200,
+			},
+		});
+	});
+});
diff --git a/web/src/features/chat-window/input/chat-world-info-binding-dialog.model.ts b/web/src/features/chat-window/input/chat-world-info-binding-dialog.model.ts
new file mode 100644
index 00000000..6287d276
--- /dev/null
+++ b/web/src/features/chat-window/input/chat-world-info-binding-dialog.model.ts
@@ -0,0 +1,28 @@
+import { Z_INDEX } from '@ui/z-index';
+
+type WorldInfoBookOptionSource = {
+	id: string;
+	name: string;
+};
+
+export function buildChatWorldInfoBindingOptions(params: {
+	noneLabel: string;
+	books: WorldInfoBookOptionSource[];
+}) {
+	return [
+		{ value: '__none__', label: params.noneLabel },
+		...params.books.map((book) => ({ value: book.id, label: book.name })),
+	];
+}
+
+export function createChatWorldInfoBindingSelectProps(nothingFoundMessage: string) {
+	return {
+		searchable: true,
+		nothingFoundMessage,
+		maxDropdownHeight: 320,
+		comboboxProps: {
+			withinPortal: true,
+			zIndex: Z_INDEX.overlay.popup,
+		},
+	} as const;
+}
diff --git a/web/src/features/chat-window/input/chat-world-info-binding-dialog.tsx b/web/src/features/chat-window/input/chat-world-info-binding-dialog.tsx
index c58954b8..eebf35c3 100644
--- a/web/src/features/chat-window/input/chat-world-info-binding-dialog.tsx
+++ b/web/src/features/chat-window/input/chat-world-info-binding-dialog.tsx
@@ -13,6 +13,11 @@ import {
 } from '@model/world-info';
 import { Dialog } from '@ui/dialog';
 
+import {
+	buildChatWorldInfoBindingOptions,
+	createChatWorldInfoBindingSelectProps,
+} from './chat-world-info-binding-dialog.model';
+
 type Props = {
 	opened: boolean;
 	onOpenChange: (open: boolean) => void;
@@ -30,20 +35,28 @@ export const ChatWorldInfoBindingDialog = ({ opened, onOpenChange, chatId, chatT
 	]);
 
 	const options = useMemo(
-		() => [{ value: '__none__', label: t('chat.management.worldInfoBindingNone') }, ...books.map((book) => ({ value: book.id, label: book.name }))],
+		() =>
+			buildChatWorldInfoBindingOptions({
+				noneLabel: t('chat.management.worldInfoBindingNone'),
+				books,
+			}),
 		[books, t],
 	);
 	const currentBook = useMemo(
 		() => books.find((book) => book.id === currentBookId) ?? null,
 		[books, currentBookId],
 	);
+	const selectProps = useMemo(
+		() => createChatWorldInfoBindingSelectProps(t('chat.management.worldInfoBindingNothingFound')),
+		[t],
+	);
 
 	return (
 		<Dialog
 			open={opened}
 			onOpenChange={onOpenChange}
 			title={t('chat.management.worldInfoBindingTitle')}
-			size="sm"
+			size="lg"
 			footer={<></>}
 		>
 			<Stack gap="sm">
@@ -57,7 +70,7 @@ export const ChatWorldInfoBindingDialog = ({ opened, onOpenChange, chatId, chatT
 					value={currentBookId ?? '__none__'}
 					data={options}
 					disabled={!chatId || bindingPending}
-					comboboxProps={{ withinPortal: false }}
+					{...selectProps}
 					onChange={(value) => {
 						if (!chatId) return;
 						bindBookToCurrentChat({
diff --git a/web/src/i18n/resources/en/chat.ts b/web/src/i18n/resources/en/chat.ts
index a400bede..fbe7e059 100644
--- a/web/src/i18n/resources/en/chat.ts
+++ b/web/src/i18n/resources/en/chat.ts
@@ -31,6 +31,7 @@
 				worldInfoBindingForChat: 'Binding for chat "{{name}}"',
 				worldInfoBindingLabel: 'Linked World Info book',
 				worldInfoBindingNone: 'Not linked',
+				worldInfoBindingNothingFound: 'Nothing found',
 				worldInfoBindingNotBound: 'No World Info linked for this chat.',
 				worldInfoOpenSidebar: 'Open World Info sidebar',
 				latestWorldInfoActivations: 'Latest World Info activations',
diff --git a/web/src/i18n/resources/ru/chat.ts b/web/src/i18n/resources/ru/chat.ts
index 39a64288..9be9a822 100644
--- a/web/src/i18n/resources/ru/chat.ts
+++ b/web/src/i18n/resources/ru/chat.ts
@@ -31,6 +31,7 @@
 				worldInfoBindingForChat: 'Привязка для чата "{{name}}"',
 				worldInfoBindingLabel: 'Привязанная книга World Info',
 				worldInfoBindingNone: 'Не привязано',
+				worldInfoBindingNothingFound: 'Ничего не найдено',
 				worldInfoBindingNotBound: 'Для этого чата World Info не привязан.',
 				worldInfoOpenSidebar: 'Открыть sidebar World Info',
 				latestWorldInfoActivations: 'Последние активации World Info',

From 51704e5eed8de5abc59bd48f9f41d4adc0f6b8ed Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 11 Apr 2026 00:17:23 +0300
Subject: [PATCH 36/54] fix: keep operation list sticky with its own scroll
 area

---
 .../operation-block-editor.tsx                |  8 +++-
 .../operation-profiles/operation-profiles.css | 36 +++++++++++++--
 .../ui/operation-list-layout.test.ts          | 21 +++++++++
 .../ui/operation-list-layout.ts               | 17 +++++++
 .../operation-profiles/ui/operation-list.tsx  | 44 +++++++++++--------
 5 files changed, 103 insertions(+), 23 deletions(-)
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-list-layout.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/ui/operation-list-layout.ts

diff --git a/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx b/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
index 5132b4a1..fa395279 100644
--- a/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
+++ b/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
@@ -12,6 +12,7 @@ import { FormInput, FormSwitch } from '@ui/form-components';
 import { fromOperationProfileForm, makeDefaultOperation, toOperationProfileForm, type OperationProfileFormValues } from './form/operation-profile-form-mapping';
 import { OperationEditor } from './ui/operation-editor/operation-editor';
 import { OperationList } from './ui/operation-list';
+import { getOperationListLayout } from './ui/operation-list-layout';
 import { isOperationKind } from './utils/operation-kind';
 
 import type { OperationListRowMeta } from './ui/types';
@@ -125,6 +126,7 @@ export const OperationBlockEditor: React.FC<Props> = ({ block, preferSplitLayout
 	const doUpdate = useUnit(updateOperationBlockFx);
 	const isMobile = useMediaQuery('(max-width: 767px)');
 	const useSplitLayout = preferSplitLayout && !isMobile;
+	const operationListLayout = useMemo(() => getOperationListLayout(useSplitLayout), [useSplitLayout]);
 
 	const initial = useMemo(() => toFormValuesFromBlock(block), [block]);
 	const methods = useForm<OperationProfileFormValues>({ defaultValues: initial });
@@ -338,13 +340,15 @@ export const OperationBlockEditor: React.FC<Props> = ({ block, preferSplitLayout
 					</Card>
 				) : useSplitLayout ? (
 					<div className="op-workspace">
-						<div className="op-listPane">
+						<div className={operationListLayout.paneClassName}>
 							<OperationList
 								rows={rows}
 								selectedOpId={selectedOpId}
 								onQuickAdd={addOperation}
 								onMoveSelection={moveSelection}
 								onSelect={(opId) => setEditingOpId(opId)}
+								className={operationListLayout.listClassName}
+								scrollAreaClassName={operationListLayout.scrollAreaClassName}
 							/>
 						</div>
 
@@ -370,6 +374,8 @@ export const OperationBlockEditor: React.FC<Props> = ({ block, preferSplitLayout
 								onQuickAdd={addOperation}
 								onMoveSelection={moveSelection}
 								onSelect={(opId) => setEditingOpId(opId)}
+								className={operationListLayout.listClassName}
+								scrollAreaClassName={operationListLayout.scrollAreaClassName}
 							/>
 						</Card>
 						<Card withBorder className="op-editorCard">{inspectorContent}</Card>
diff --git a/web/src/features/sidebars/operation-profiles/operation-profiles.css b/web/src/features/sidebars/operation-profiles/operation-profiles.css
index 51dcd325..327f7a4a 100644
--- a/web/src/features/sidebars/operation-profiles/operation-profiles.css
+++ b/web/src/features/sidebars/operation-profiles/operation-profiles.css
@@ -117,6 +117,19 @@
 	align-items: start;
 }
 
+.op-ui .op-listPane {
+	display: flex;
+	flex-direction: column;
+	min-height: 0;
+}
+
+.op-ui .op-stickyPane {
+	position: sticky;
+	top: 0;
+	max-height: calc(100dvh - 180px);
+	overflow: hidden;
+}
+
 .op-ui .op-listPane,
 .op-ui .op-inspectorPane {
 	background: var(--op-surface);
@@ -127,21 +140,38 @@
 }
 
 .op-ui .op-listHeader {
-	position: sticky;
-	top: 0;
 	background: var(--op-surface);
-	z-index: 4;
 	padding-bottom: var(--op-space-sm);
 	border-bottom: 1px solid var(--op-border);
 	margin-bottom: var(--op-space-sm);
 }
 
+.op-ui .op-listLayout {
+	min-height: 0;
+}
+
+.op-ui .op-stickyPane .op-listLayout {
+	height: 100%;
+}
+
 .op-ui .op-listScrollArea {
 	max-height: min(56vh, 640px);
 	overflow-y: auto;
 	padding-right: 4px;
 }
 
+.op-ui .op-listScrollArea--fill {
+	flex: 1;
+	min-height: 0;
+	max-height: none;
+}
+
+.op-ui .op-listRows {
+	display: flex;
+	flex-direction: column;
+	gap: var(--op-space-xs);
+}
+
 .op-ui .op-listHint {
 	font-size: 12px;
 	color: var(--op-muted);
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-list-layout.test.ts b/web/src/features/sidebars/operation-profiles/ui/operation-list-layout.test.ts
new file mode 100644
index 00000000..412d10d0
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-list-layout.test.ts
@@ -0,0 +1,21 @@
+import { describe, expect, it } from 'vitest';
+
+import { getOperationListLayout } from './operation-list-layout';
+
+describe('operation-list-layout', () => {
+	it('enables sticky pane classes for split layout', () => {
+		expect(getOperationListLayout(true)).toEqual({
+			paneClassName: 'op-listPane op-stickyPane',
+			listClassName: 'op-focusRing op-listLayout',
+			scrollAreaClassName: 'op-listScrollArea op-listScrollArea--fill',
+		});
+	});
+
+	it('keeps the default scroll area classes for stacked layout', () => {
+		expect(getOperationListLayout(false)).toEqual({
+			paneClassName: 'op-listPane',
+			listClassName: 'op-focusRing op-listLayout',
+			scrollAreaClassName: 'op-listScrollArea',
+		});
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-list-layout.ts b/web/src/features/sidebars/operation-profiles/ui/operation-list-layout.ts
new file mode 100644
index 00000000..c7da7f63
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-list-layout.ts
@@ -0,0 +1,17 @@
+export type OperationListLayout = {
+	paneClassName: string;
+	listClassName: string;
+	scrollAreaClassName: string;
+};
+
+const BASE_PANE_CLASS_NAME = 'op-listPane';
+const BASE_LIST_CLASS_NAME = 'op-focusRing op-listLayout';
+const BASE_SCROLL_AREA_CLASS_NAME = 'op-listScrollArea';
+
+export function getOperationListLayout(isSplitLayout: boolean): OperationListLayout {
+	return {
+		paneClassName: isSplitLayout ? `${BASE_PANE_CLASS_NAME} op-stickyPane` : BASE_PANE_CLASS_NAME,
+		listClassName: BASE_LIST_CLASS_NAME,
+		scrollAreaClassName: isSplitLayout ? `${BASE_SCROLL_AREA_CLASS_NAME} op-listScrollArea--fill` : BASE_SCROLL_AREA_CLASS_NAME,
+	};
+}
diff --git a/web/src/features/sidebars/operation-profiles/ui/operation-list.tsx b/web/src/features/sidebars/operation-profiles/ui/operation-list.tsx
index 61f01c23..a754a234 100644
--- a/web/src/features/sidebars/operation-profiles/ui/operation-list.tsx
+++ b/web/src/features/sidebars/operation-profiles/ui/operation-list.tsx
@@ -20,6 +20,8 @@ type Props = {
 	onQuickAdd: () => void;
 	onMoveSelection: (direction: 'prev' | 'next') => void;
 	onFocusEditor?: () => void;
+	className?: string;
+	scrollAreaClassName?: string;
 };
 
 const DEFAULT_FILTERS: OperationFilterState = {
@@ -67,6 +69,8 @@ export const OperationList: React.FC<Props> = ({
 	onQuickAdd,
 	onMoveSelection,
 	onFocusEditor,
+	className,
+	scrollAreaClassName = 'op-listScrollArea',
 }) => {
 	const { t } = useTranslation();
 	const { control } = useFormContext();
@@ -159,7 +163,7 @@ export const OperationList: React.FC<Props> = ({
 			gap="xs"
 			role="listbox"
 			tabIndex={0}
-			className="op-focusRing"
+			className={className ?? 'op-focusRing op-listLayout'}
 			onKeyDown={(event) => {
 				if (isTextEditingTarget(event.target)) return;
 				if (event.key === 'ArrowUp') {
@@ -252,12 +256,12 @@ export const OperationList: React.FC<Props> = ({
 				/>
 			</Group>
 
-			{filteredRows.length === 0 ? (
-				<Text size="sm" c="dimmed">
-					{t('operationProfiles.filters.noMatches')}
-				</Text>
-			) : shouldVirtualize ? (
-				<div ref={scrollRef} className="op-listScrollArea">
+			<div ref={scrollRef} className={scrollAreaClassName}>
+				{filteredRows.length === 0 ? (
+					<Text size="sm" c="dimmed">
+						{t('operationProfiles.filters.noMatches')}
+					</Text>
+				) : shouldVirtualize ? (
 					<div style={{ height: `${virtualizer.getTotalSize()}px`, position: 'relative' }}>
 						{virtualizer.getVirtualItems().map((virtualRow) => {
 							const row = filteredRows[virtualRow.index];
@@ -284,18 +288,20 @@ export const OperationList: React.FC<Props> = ({
 							);
 						})}
 					</div>
-				</div>
-			) : (
-				filteredRows.map((row) => (
-					<OperationRowContainer
-						key={row.rowKey}
-						index={row.index}
-						opId={row.opId}
-						selected={selectedOpId === row.opId}
-						onSelect={onSelect}
-					/>
-				))
-			)}
+				) : (
+					<div className="op-listRows">
+						{filteredRows.map((row) => (
+							<OperationRowContainer
+								key={row.rowKey}
+								index={row.index}
+								opId={row.opId}
+								selected={selectedOpId === row.opId}
+								onSelect={onSelect}
+							/>
+						))}
+					</div>
+				)}
+			</div>
 		</Stack>
 	);
 };

From ca45b9ce98f093c06e034fb596e6e8ab19d7699f Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 11 Apr 2026 00:22:49 +0300
Subject: [PATCH 37/54] fix: preserve sidebar form state when toggling
 fullscreen

---
 web/src/index.css                      | 52 +++++++++++++++--------
 web/src/ui/drawer-presentation.test.ts | 35 ++++++++++++++++
 web/src/ui/drawer-presentation.ts      | 33 +++++++++++++++
 web/src/ui/drawer.tsx                  | 57 ++++++++++----------------
 4 files changed, 124 insertions(+), 53 deletions(-)
 create mode 100644 web/src/ui/drawer-presentation.test.ts
 create mode 100644 web/src/ui/drawer-presentation.ts

diff --git a/web/src/index.css b/web/src/index.css
index 40b1388a..281939e4 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -544,18 +544,6 @@ a {
   gap: 6px;
 }
 
-.ts-sidebar-drawer-body {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  min-height: 0;
-  padding: 16px;
-}
-
-.ts-sidebar-drawer-content {
-  border-radius: 0;
-}
-
 .ts-sidebar-modal-content {
   background: transparent;
   box-shadow: none;
@@ -566,23 +554,51 @@ a {
   padding: 0;
 }
 
-.ts-sidebar-modal-frame {
+.ts-sidebar-frame {
   height: 100%;
+  background: var(--ts-overlay);
+}
+
+.ts-sidebar-frame--fullscreen {
   overflow: auto;
   padding: 20px;
-  background: var(--ts-overlay);
 }
 
-.ts-sidebar-modal-container {
-  height: calc(100vh - 40px);
-  margin: 0 auto;
+.ts-sidebar-frame--drawer {
+  display: flex;
+  padding: 0;
+}
+
+.ts-sidebar-frame--start {
+  justify-content: flex-start;
+}
+
+.ts-sidebar-frame--end {
+  justify-content: flex-end;
+}
+
+.ts-sidebar-container {
   border: 1px solid var(--ts-border-soft);
-  border-radius: 18px;
   background: var(--ts-surface);
   box-shadow: var(--ts-shadow-strong);
+}
+
+.ts-sidebar-container--fullscreen {
+  height: calc(100vh - 40px);
+  margin: 0 auto;
+  border-radius: 18px;
   padding: 18px;
 }
 
+.ts-sidebar-container--drawer {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  min-height: 0;
+  border-radius: 0;
+  padding: 16px;
+}
+
 .ts-md {
   font-family: var(--ts-font-chat);
   font-size: var(--ts-md-font-size);
diff --git a/web/src/ui/drawer-presentation.test.ts b/web/src/ui/drawer-presentation.test.ts
new file mode 100644
index 00000000..cb4cc66e
--- /dev/null
+++ b/web/src/ui/drawer-presentation.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest';
+
+import { getDrawerPresentation } from './drawer-presentation';
+
+describe('drawer-presentation', () => {
+	it('returns drawer-aligned presentation when fullscreen is disabled', () => {
+		expect(
+			getDrawerPresentation({
+				drawerWidth: 560,
+				fullScreen: false,
+				fullscreenContentMaxWidth: 1440,
+				placement: 'start',
+			}),
+		).toEqual({
+			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--drawer ts-sidebar-frame--start',
+			containerClassName: 'ts-sidebar-container ts-sidebar-container--drawer',
+			containerStyle: { width: 560 },
+		});
+	});
+
+	it('returns centered fullscreen presentation when fullscreen is enabled', () => {
+		expect(
+			getDrawerPresentation({
+				drawerWidth: 560,
+				fullScreen: true,
+				fullscreenContentMaxWidth: 1440,
+				placement: 'end',
+			}),
+		).toEqual({
+			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
+			containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
+			containerStyle: { maxWidth: 1440 },
+		});
+	});
+});
diff --git a/web/src/ui/drawer-presentation.ts b/web/src/ui/drawer-presentation.ts
new file mode 100644
index 00000000..22268b05
--- /dev/null
+++ b/web/src/ui/drawer-presentation.ts
@@ -0,0 +1,33 @@
+type DrawerPresentationInput = {
+	drawerWidth: number | string;
+	fullScreen: boolean;
+	fullscreenContentMaxWidth: number;
+	placement: 'start' | 'end';
+};
+
+type DrawerPresentation = {
+	frameClassName: string;
+	containerClassName: string;
+	containerStyle: Record<string, number | string>;
+};
+
+export function getDrawerPresentation({
+	drawerWidth,
+	fullScreen,
+	fullscreenContentMaxWidth,
+	placement,
+}: DrawerPresentationInput): DrawerPresentation {
+	if (fullScreen) {
+		return {
+			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
+			containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
+			containerStyle: { maxWidth: fullscreenContentMaxWidth },
+		};
+	}
+
+	return {
+		frameClassName: `ts-sidebar-frame ts-sidebar-frame--drawer ts-sidebar-frame--${placement}`,
+		containerClassName: 'ts-sidebar-container ts-sidebar-container--drawer',
+		containerStyle: { width: drawerWidth },
+	};
+}
diff --git a/web/src/ui/drawer.tsx b/web/src/ui/drawer.tsx
index 18d214ed..0b0c6806 100644
--- a/web/src/ui/drawer.tsx
+++ b/web/src/ui/drawer.tsx
@@ -1,10 +1,11 @@
-import { Box, Drawer as MantineDrawer, Modal } from '@mantine/core';
+import { Box, Modal } from '@mantine/core';
 import { useStoreMap } from 'effector-react';
 import { useTranslation } from 'react-i18next';
 
 import { $sidebars, changeSidebarSettings, type SidebarName, toggleSidebarOpen } from '@model/sidebars';
 import { Z_INDEX } from '@ui/z-index';
 
+import { getDrawerPresentation } from './drawer-presentation';
 import { SidebarShell } from './sidebar-shell';
 
 import type { ReactNode } from 'react';
@@ -40,6 +41,12 @@ export const Drawer = ({ name, title, children, fullscreenContentMaxWidth = 1440
 	const resolvedSize = fixedSize ?? size ?? defaultSize;
 	const fullScreen = isFullscreen || resolvedSize === 'full';
 	const drawerWidth = resolvedSize === 'full' ? '100%' : drawerWidthBySize[resolvedSize];
+	const presentation = getDrawerPresentation({
+		drawerWidth,
+		fullScreen,
+		fullscreenContentMaxWidth,
+		placement,
+	});
 
 	const handleClose = () => {
 		toggleSidebarOpen({ name, isOpen: false });
@@ -57,8 +64,6 @@ export const Drawer = ({ name, title, children, fullscreenContentMaxWidth = 1440
 	};
 
 	if (!isOpen) return null;
-
-	const position: 'left' | 'right' = placement === 'end' ? 'right' : 'left';
 	const shell = (
 		<SidebarShell
 			title={title}
@@ -79,44 +84,26 @@ export const Drawer = ({ name, title, children, fullscreenContentMaxWidth = 1440
 		</SidebarShell>
 	);
 
-	if (fullScreen) {
-		return (
-			<Modal
-				opened={isOpen}
-				onClose={handleClose}
-				fullScreen
-				withinPortal={!contained}
-				withCloseButton={false}
-				padding={0}
-				zIndex={Z_INDEX.overlay.drawer}
-				classNames={{
-					content: 'ts-sidebar-modal-content',
-					body: 'ts-sidebar-modal-body',
-				}}
-			>
-				<Box className="ts-sidebar-modal-frame ts-scrollbar-thin">
-					<Box className="ts-sidebar-modal-container" style={{ maxWidth: fullscreenContentMaxWidth }}>
-						{shell}
-					</Box>
-				</Box>
-			</Modal>
-		);
-	}
-
 	return (
-		<MantineDrawer
+		<Modal
 			opened={isOpen}
 			onClose={handleClose}
-			position={position}
-			size={drawerWidth}
-			radius={0}
-			withOverlay={!contained}
+			fullScreen
 			withinPortal={!contained}
 			withCloseButton={false}
+			padding={0}
+			withOverlay={!contained}
 			zIndex={Z_INDEX.overlay.drawer}
-			classNames={{ content: 'ts-sidebar-drawer-content', body: 'ts-sidebar-drawer-body' }}
+			classNames={{
+				content: 'ts-sidebar-modal-content',
+				body: 'ts-sidebar-modal-body',
+			}}
 		>
-			{shell}
-		</MantineDrawer>
+			<Box className={`${presentation.frameClassName} ts-scrollbar-thin`}>
+				<Box className={presentation.containerClassName} style={presentation.containerStyle}>
+					{shell}
+				</Box>
+			</Box>
+		</Modal>
 	);
 };

From d17825b81a646a1eeb2d11f78bca140fab8d339f Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Mon, 13 Apr 2026 23:25:02 +0300
Subject: [PATCH 38/54] fix: restore fullscreen edit modal layout

---
 web/src/index.css                      | 10 +++++-----
 web/src/ui/dialog.tsx                  |  6 ++++--
 web/src/ui/drawer-presentation.test.ts | 10 +++++++++-
 web/src/ui/drawer-presentation.ts      | 14 +++++++++-----
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/web/src/index.css b/web/src/index.css
index 281939e4..9e501ce0 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -668,7 +668,7 @@ a {
 .ts-scrollbar-thin,
 .ts-chat-scroll,
 .ts-sidebar-shell__content,
-.ts-sidebar-modal-frame {
+.ts-sidebar-frame--fullscreen {
   scrollbar-width: thin;
   scrollbar-color: var(--ts-scrollbar-thumb) transparent;
 }
@@ -676,7 +676,7 @@ a {
 .ts-scrollbar-thin::-webkit-scrollbar,
 .ts-chat-scroll::-webkit-scrollbar,
 .ts-sidebar-shell__content::-webkit-scrollbar,
-.ts-sidebar-modal-frame::-webkit-scrollbar {
+.ts-sidebar-frame--fullscreen::-webkit-scrollbar {
   width: 10px;
   height: 10px;
 }
@@ -684,7 +684,7 @@ a {
 .ts-scrollbar-thin::-webkit-scrollbar-thumb,
 .ts-chat-scroll::-webkit-scrollbar-thumb,
 .ts-sidebar-shell__content::-webkit-scrollbar-thumb,
-.ts-sidebar-modal-frame::-webkit-scrollbar-thumb {
+.ts-sidebar-frame--fullscreen::-webkit-scrollbar-thumb {
   border-radius: 999px;
   border: 2px solid transparent;
   background-clip: content-box;
@@ -700,11 +700,11 @@ a {
     width: min(42vw, 320px);
   }
 
-  .ts-sidebar-modal-frame {
+  .ts-sidebar-frame--fullscreen {
     padding: 12px;
   }
 
-  .ts-sidebar-modal-container {
+  .ts-sidebar-container--fullscreen {
     height: calc(100vh - 24px);
     padding: 12px;
   }
diff --git a/web/src/ui/dialog.tsx b/web/src/ui/dialog.tsx
index 7f2ffb1a..a5c3be90 100644
--- a/web/src/ui/dialog.tsx
+++ b/web/src/ui/dialog.tsx
@@ -1,6 +1,7 @@
 import { Button, Group, Modal, Stack } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 
+import { getFullscreenSidebarPresentation } from './drawer-presentation';
 import { Z_INDEX } from './z-index';
 
 import type { ReactNode } from 'react';
@@ -40,6 +41,7 @@ export const Dialog = ({
 	const fullScreen = size === 'cover';
 	const modalSize = fullScreen ? '100%' : size;
 	const drawerLikeFullscreen = fullScreen && typeof fullScreenContentMaxWidth === 'number';
+	const fullscreenPresentation = drawerLikeFullscreen ? getFullscreenSidebarPresentation(fullScreenContentMaxWidth) : null;
 	const content = (
 		<div
 			style={
@@ -97,8 +99,8 @@ export const Dialog = ({
 			}
 		>
 			{drawerLikeFullscreen ? (
-				<div className="ts-sidebar-modal-frame ts-scrollbar-thin">
-					<div className="ts-sidebar-modal-container" style={{ maxWidth: fullScreenContentMaxWidth }}>
+				<div className={`${fullscreenPresentation?.frameClassName ?? ''} ts-scrollbar-thin`}>
+					<div className={fullscreenPresentation?.containerClassName} style={fullscreenPresentation?.containerStyle}>
 						{content}
 					</div>
 				</div>
diff --git a/web/src/ui/drawer-presentation.test.ts b/web/src/ui/drawer-presentation.test.ts
index cb4cc66e..c26ed07b 100644
--- a/web/src/ui/drawer-presentation.test.ts
+++ b/web/src/ui/drawer-presentation.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { getDrawerPresentation } from './drawer-presentation';
+import { getDrawerPresentation, getFullscreenSidebarPresentation } from './drawer-presentation';
 
 describe('drawer-presentation', () => {
 	it('returns drawer-aligned presentation when fullscreen is disabled', () => {
@@ -32,4 +32,12 @@ describe('drawer-presentation', () => {
 			containerStyle: { maxWidth: 1440 },
 		});
 	});
+
+	it('returns shared fullscreen modal presentation', () => {
+		expect(getFullscreenSidebarPresentation(1320)).toEqual({
+			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
+			containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
+			containerStyle: { maxWidth: 1320 },
+		});
+	});
 });
diff --git a/web/src/ui/drawer-presentation.ts b/web/src/ui/drawer-presentation.ts
index 22268b05..9c00d542 100644
--- a/web/src/ui/drawer-presentation.ts
+++ b/web/src/ui/drawer-presentation.ts
@@ -11,6 +11,14 @@ type DrawerPresentation = {
 	containerStyle: Record<string, number | string>;
 };
 
+export function getFullscreenSidebarPresentation(fullscreenContentMaxWidth: number): DrawerPresentation {
+	return {
+		frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
+		containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
+		containerStyle: { maxWidth: fullscreenContentMaxWidth },
+	};
+}
+
 export function getDrawerPresentation({
 	drawerWidth,
 	fullScreen,
@@ -18,11 +26,7 @@ export function getDrawerPresentation({
 	placement,
 }: DrawerPresentationInput): DrawerPresentation {
 	if (fullScreen) {
-		return {
-			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
-			containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
-			containerStyle: { maxWidth: fullscreenContentMaxWidth },
-		};
+		return getFullscreenSidebarPresentation(fullscreenContentMaxWidth);
 	}
 
 	return {

From 9d1f77e1c8c87153da45df9b0248cc1f68ef8afa Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sun, 19 Apr 2026 21:17:48 +0300
Subject: [PATCH 39/54] feat: add searchable world info binding select

---
 .../entity-profile-editor-modal.tsx           | 61 +++---------
 .../user-person-world-info-section.tsx        | 54 +++-------
 .../world-info-binding-section.model.test.ts  | 35 +++++++
 .../world-info-binding-section.model.ts       | 31 ++++++
 .../world-info/world-info-binding-section.tsx | 98 +++++++++++++++++++
 web/src/i18n/resources/en/agentCards.ts       |  1 +
 web/src/i18n/resources/en/userPersons.ts      |  1 +
 web/src/i18n/resources/ru/agentCards.ts       |  1 +
 web/src/i18n/resources/ru/userPersons.ts      |  1 +
 9 files changed, 199 insertions(+), 84 deletions(-)
 create mode 100644 web/src/features/sidebars/world-info/world-info-binding-section.model.test.ts
 create mode 100644 web/src/features/sidebars/world-info/world-info-binding-section.model.ts
 create mode 100644 web/src/features/sidebars/world-info/world-info-binding-section.tsx

diff --git a/web/src/features/sidebars/agent-cards/entity-profile-editor-modal.tsx b/web/src/features/sidebars/agent-cards/entity-profile-editor-modal.tsx
index 13e1447f..da5199c0 100644
--- a/web/src/features/sidebars/agent-cards/entity-profile-editor-modal.tsx
+++ b/web/src/features/sidebars/agent-cards/entity-profile-editor-modal.tsx
@@ -23,6 +23,7 @@ import { LiquidDocsButton } from '@ui/liquid-template-docs';
 
 import { BACKEND_ORIGIN } from '../../../api/chat-core';
 import { AvatarUpload } from '../../common/avatar-upload';
+import { WorldInfoBindingSection } from '../world-info/world-info-binding-section';
 
 import { parseSpec } from './spec-utils';
 
@@ -250,19 +251,6 @@ export const EntityProfileEditorModal = ({
 		name: 'alternateGreetings',
 	});
 
-	const worldInfoOptions = useMemo(
-		() => [
-			{ value: '__none__', label: t('agentCards.worldInfo.none') },
-			...worldInfoBooks.map((book) => ({ value: book.id, label: book.name })),
-		],
-		[t, worldInfoBooks],
-	);
-
-	const selectedWorldInfoBook = useMemo(
-		() => worldInfoBooks.find((book) => book.id === worldInfoBookId) ?? null,
-		[worldInfoBookId, worldInfoBooks],
-	);
-
 	useEffect(() => {
 		const justOpened = opened && !wasOpenedRef.current;
 		wasOpenedRef.current = opened;
@@ -591,38 +579,21 @@ export const EntityProfileEditorModal = ({
 							</Tabs.Panel>
 
 							<Tabs.Panel value="worldInfo" pt="md" style={{ overflowY: 'auto' }}>
-								<Stack gap="md">
-									<Select
-										label={t('agentCards.worldInfo.bindingLabel')}
-										value={worldInfoBookId ?? '__none__'}
-										data={worldInfoOptions}
-										disabled={!profile || isBusy || worldInfoBindingPending}
-										comboboxProps={{ withinPortal: false }}
-										onChange={(value) => {
-											if (!profile) return;
-											onWorldInfoBindingChange(profile, value === '__none__' ? null : value ?? null);
-										}}
-									/>
-
-									{selectedWorldInfoBook ? (
-										<Stack gap={4}>
-											<Text size="sm" fw={600}>
-												{selectedWorldInfoBook.name}
-											</Text>
-											<Text size="xs" c="dimmed">
-												slug: {selectedWorldInfoBook.slug}
-											</Text>
-										</Stack>
-									) : (
-										<Text size="sm" c="dimmed">
-											{t('agentCards.worldInfo.notBound')}
-										</Text>
-									)}
-
-									<Button type="button" variant="light" onClick={onOpenWorldInfoSidebar}>
-										{t('agentCards.worldInfo.openEditor')}
-									</Button>
-								</Stack>
+								<WorldInfoBindingSection
+									books={worldInfoBooks}
+									selectedBookId={worldInfoBookId}
+									noneLabel={t('agentCards.worldInfo.none')}
+									bindingLabel={t('agentCards.worldInfo.bindingLabel')}
+									notBoundText={t('agentCards.worldInfo.notBound')}
+									openEditorLabel={t('agentCards.worldInfo.openEditor')}
+									nothingFoundMessage={t('agentCards.worldInfo.nothingFound')}
+									disabled={!profile || isBusy || worldInfoBindingPending}
+									onBindingChange={(bookId) => {
+										if (!profile) return;
+										onWorldInfoBindingChange(profile, bookId);
+									}}
+									onOpenEditor={onOpenWorldInfoSidebar}
+								/>
 							</Tabs.Panel>
 
 							<Tabs.Panel value="advanced" pt="md" style={{ overflowY: 'auto' }}>
diff --git a/web/src/features/sidebars/user-person/user-person-world-info-section.tsx b/web/src/features/sidebars/user-person/user-person-world-info-section.tsx
index 4792da68..5c63c293 100644
--- a/web/src/features/sidebars/user-person/user-person-world-info-section.tsx
+++ b/web/src/features/sidebars/user-person/user-person-world-info-section.tsx
@@ -1,6 +1,5 @@
-import { Button, Paper, Select, Stack, Text } from '@mantine/core';
+import { Paper, Stack, Text } from '@mantine/core';
 import { useUnit } from 'effector-react';
-import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { toggleSidebarOpen } from '@model/sidebars';
@@ -12,6 +11,8 @@ import {
 	worldInfoEditorOpenRequested,
 } from '@model/world-info';
 
+import { WorldInfoBindingSection } from '../world-info/world-info-binding-section';
+
 type Props = {
 	personaId: string;
 };
@@ -26,56 +27,31 @@ export const UserPersonWorldInfoSection = ({ personaId }: Props) => {
 	]);
 
 	const selectedBookId = bookByPersonaId[personaId] ?? null;
-	const selectedBook = useMemo(
-		() => books.find((book) => book.id === selectedBookId) ?? null,
-		[books, selectedBookId],
-	);
-	const options = useMemo(
-		() => [{ value: '__none__', label: t('userPersons.worldInfo.none') }, ...books.map((book) => ({ value: book.id, label: book.name }))],
-		[books, t],
-	);
 
 	return (
 		<Paper withBorder p="md" radius="md">
 			<Stack gap="sm">
 				<Text fw={600}>{t('userPersons.worldInfo.title')}</Text>
-				<Select
-					label={t('userPersons.worldInfo.bindingLabel')}
-					value={selectedBookId ?? '__none__'}
-					data={options}
+				<WorldInfoBindingSection
+					books={books}
+					selectedBookId={selectedBookId}
+					noneLabel={t('userPersons.worldInfo.none')}
+					bindingLabel={t('userPersons.worldInfo.bindingLabel')}
+					notBoundText={t('userPersons.worldInfo.notBound')}
+					openEditorLabel={t('userPersons.worldInfo.openEditor')}
+					nothingFoundMessage={t('userPersons.worldInfo.nothingFound')}
 					disabled={bindingPending}
-					comboboxProps={{ withinPortal: false }}
-					onChange={(value) =>
+					onBindingChange={(bookId) =>
 						bindBookToPersona({
 							personaId,
-							bookId: value === '__none__' ? null : value ?? null,
+							bookId,
 						})
 					}
-				/>
-				{selectedBook ? (
-					<Stack gap={4}>
-						<Text size="sm" fw={600}>
-							{selectedBook.name}
-						</Text>
-						<Text size="xs" c="dimmed">
-							slug: {selectedBook.slug}
-						</Text>
-					</Stack>
-				) : (
-					<Text size="sm" c="dimmed">
-						{t('userPersons.worldInfo.notBound')}
-					</Text>
-				)}
-				<Button
-					type="button"
-					variant="light"
-					onClick={() => {
+					onOpenEditor={() => {
 						toggleSidebarOpen({ name: 'worldInfo', isOpen: true });
 						worldInfoEditorOpenRequested({ bookId: selectedBookId });
 					}}
-				>
-					{t('userPersons.worldInfo.openEditor')}
-				</Button>
+				/>
 			</Stack>
 		</Paper>
 	);
diff --git a/web/src/features/sidebars/world-info/world-info-binding-section.model.test.ts b/web/src/features/sidebars/world-info/world-info-binding-section.model.test.ts
new file mode 100644
index 00000000..923f746e
--- /dev/null
+++ b/web/src/features/sidebars/world-info/world-info-binding-section.model.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+	buildWorldInfoBindingOptions,
+	createWorldInfoBindingSelectProps,
+} from './world-info-binding-section.model';
+
+describe('world info binding section model', () => {
+	it('prepends the unbound option before world info books', () => {
+		expect(
+			buildWorldInfoBindingOptions({
+				noneLabel: 'Not linked',
+				books: [
+					{ id: 'book-1', name: 'Alpha' },
+					{ id: 'book-2', name: 'Beta' },
+				],
+			}),
+		).toEqual([
+			{ value: '__none__', label: 'Not linked' },
+			{ value: 'book-1', label: 'Alpha' },
+			{ value: 'book-2', label: 'Beta' },
+		]);
+	});
+
+	it('enables name search in the dropdown', () => {
+		expect(createWorldInfoBindingSelectProps('No matches')).toEqual({
+			searchable: true,
+			nothingFoundMessage: 'No matches',
+			maxDropdownHeight: 320,
+			comboboxProps: {
+				withinPortal: false,
+			},
+		});
+	});
+});
diff --git a/web/src/features/sidebars/world-info/world-info-binding-section.model.ts b/web/src/features/sidebars/world-info/world-info-binding-section.model.ts
new file mode 100644
index 00000000..ba0268dc
--- /dev/null
+++ b/web/src/features/sidebars/world-info/world-info-binding-section.model.ts
@@ -0,0 +1,31 @@
+export const WORLD_INFO_UNBOUND_OPTION_VALUE = '__none__';
+
+type WorldInfoBookOptionSource = {
+	id: string;
+	name: string;
+};
+
+export function buildWorldInfoBindingOptions(params: {
+	noneLabel: string;
+	books: WorldInfoBookOptionSource[];
+}) {
+	return [
+		{ value: WORLD_INFO_UNBOUND_OPTION_VALUE, label: params.noneLabel },
+		...params.books.map((book) => ({ value: book.id, label: book.name })),
+	];
+}
+
+export function createWorldInfoBindingSelectProps(nothingFoundMessage: string) {
+	return {
+		searchable: true,
+		nothingFoundMessage,
+		maxDropdownHeight: 320,
+		comboboxProps: {
+			withinPortal: false,
+		},
+	} as const;
+}
+
+export function parseWorldInfoBindingValue(value: string | null): string | null {
+	return value === WORLD_INFO_UNBOUND_OPTION_VALUE ? null : value;
+}
diff --git a/web/src/features/sidebars/world-info/world-info-binding-section.tsx b/web/src/features/sidebars/world-info/world-info-binding-section.tsx
new file mode 100644
index 00000000..233b5671
--- /dev/null
+++ b/web/src/features/sidebars/world-info/world-info-binding-section.tsx
@@ -0,0 +1,98 @@
+import { Button, Select, Stack, Text } from '@mantine/core';
+import { useMemo } from 'react';
+
+import {
+	WORLD_INFO_UNBOUND_OPTION_VALUE,
+	buildWorldInfoBindingOptions,
+	createWorldInfoBindingSelectProps,
+	parseWorldInfoBindingValue,
+} from './world-info-binding-section.model';
+
+export type WorldInfoBindingBook = {
+	id: string;
+	name: string;
+	slug: string;
+};
+
+type Props = {
+	books: WorldInfoBindingBook[];
+	selectedBookId: string | null;
+	noneLabel: string;
+	bindingLabel: string;
+	notBoundText: string;
+	openEditorLabel: string;
+	nothingFoundMessage: string;
+	disabled?: boolean;
+	onBindingChange: (bookId: string | null) => void;
+	onOpenEditor: () => void;
+};
+
+function WorldInfoBindingSummary({
+	book,
+	notBoundText,
+}: {
+	book: WorldInfoBindingBook | null;
+	notBoundText: string;
+}) {
+	if (!book) {
+		return (
+			<Text size="sm" c="dimmed">
+				{notBoundText}
+			</Text>
+		);
+	}
+
+	return (
+		<Stack gap={4}>
+			<Text size="sm" fw={600}>
+				{book.name}
+			</Text>
+			<Text size="xs" c="dimmed">
+				slug: {book.slug}
+			</Text>
+		</Stack>
+	);
+}
+
+export function WorldInfoBindingSection({
+	books,
+	selectedBookId,
+	noneLabel,
+	bindingLabel,
+	notBoundText,
+	openEditorLabel,
+	nothingFoundMessage,
+	disabled,
+	onBindingChange,
+	onOpenEditor,
+}: Props) {
+	const options = useMemo(
+		() => buildWorldInfoBindingOptions({ noneLabel, books }),
+		[books, noneLabel],
+	);
+	const selectedBook = useMemo(
+		() => books.find((book) => book.id === selectedBookId) ?? null,
+		[books, selectedBookId],
+	);
+	const selectProps = useMemo(
+		() => createWorldInfoBindingSelectProps(nothingFoundMessage),
+		[nothingFoundMessage],
+	);
+
+	return (
+		<Stack gap="md">
+			<Select
+				label={bindingLabel}
+				value={selectedBookId ?? WORLD_INFO_UNBOUND_OPTION_VALUE}
+				data={options}
+				disabled={disabled}
+				{...selectProps}
+				onChange={(value) => onBindingChange(parseWorldInfoBindingValue(value))}
+			/>
+			<WorldInfoBindingSummary book={selectedBook} notBoundText={notBoundText} />
+			<Button type="button" variant="light" onClick={onOpenEditor}>
+				{openEditorLabel}
+			</Button>
+		</Stack>
+	);
+}
diff --git a/web/src/i18n/resources/en/agentCards.ts b/web/src/i18n/resources/en/agentCards.ts
index 71ae5505..72b85e73 100644
--- a/web/src/i18n/resources/en/agentCards.ts
+++ b/web/src/i18n/resources/en/agentCards.ts
@@ -15,6 +15,7 @@
 				none: 'Not linked',
 				notBound: 'No World Info linked for this profile.',
 				bindingLabel: 'Linked World Info book',
+				nothingFound: 'Nothing found',
 				openEditor: 'Open World Info editor',
 				statusAria: 'World Info status',
 				statusBoundTooltip: 'World Info: {{name}}. Alt+click to open.',
diff --git a/web/src/i18n/resources/en/userPersons.ts b/web/src/i18n/resources/en/userPersons.ts
index fa9b3c48..465ac816 100644
--- a/web/src/i18n/resources/en/userPersons.ts
+++ b/web/src/i18n/resources/en/userPersons.ts
@@ -42,6 +42,7 @@ const enUserPersons = {
 		none: 'Not linked',
 		notBound: 'No World Info linked for this persona.',
 		bindingLabel: 'Linked World Info book',
+		nothingFound: 'Nothing found',
 		openEditor: 'Open World Info editor',
 		statusAria: 'World Info status',
 		statusBoundTooltip: 'World Info: {{name}}',
diff --git a/web/src/i18n/resources/ru/agentCards.ts b/web/src/i18n/resources/ru/agentCards.ts
index 059ac3af..aaa947f2 100644
--- a/web/src/i18n/resources/ru/agentCards.ts
+++ b/web/src/i18n/resources/ru/agentCards.ts
@@ -15,6 +15,7 @@
 				none: 'Не привязано',
 				notBound: 'Для этого профиля World Info не привязан.',
 				bindingLabel: 'Привязанная книга World Info',
+				nothingFound: 'Ничего не найдено',
 				openEditor: 'Открыть редактор World Info',
 				statusAria: 'Статус World Info',
 				statusBoundTooltip: 'World Info: {{name}}. Alt+клик для открытия.',
diff --git a/web/src/i18n/resources/ru/userPersons.ts b/web/src/i18n/resources/ru/userPersons.ts
index 47e1a702..3a13479b 100644
--- a/web/src/i18n/resources/ru/userPersons.ts
+++ b/web/src/i18n/resources/ru/userPersons.ts
@@ -42,6 +42,7 @@ const ruUserPersons = {
 		none: 'Не привязано',
 		notBound: 'Для этой персоны World Info не привязан.',
 		bindingLabel: 'Привязанная книга World Info',
+		nothingFound: 'Ничего не найдено',
 		openEditor: 'Открыть редактор World Info',
 		statusAria: 'Статус World Info',
 		statusBoundTooltip: 'World Info: {{name}}',

From de2ef05e2b41681b4acff767776b20ca4109c3d8 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sun, 19 Apr 2026 23:55:38 +0300
Subject: [PATCH 40/54] refactor: group world info settings and localize labels

---
 .../features/sidebars/world-info/index.tsx    |  81 +------
 .../world-info-settings-groups.test.ts        |  35 +++
 .../world-info/world-info-settings-groups.ts  |  53 ++++
 .../world-info/world-info-settings-panel.tsx  | 226 ++++++++++++++++++
 web/src/i18n/resources/en/worldInfo.ts        |  18 ++
 web/src/i18n/resources/ru/worldInfo.ts        |  52 ++--
 6 files changed, 376 insertions(+), 89 deletions(-)
 create mode 100644 web/src/features/sidebars/world-info/world-info-settings-groups.test.ts
 create mode 100644 web/src/features/sidebars/world-info/world-info-settings-groups.ts
 create mode 100644 web/src/features/sidebars/world-info/world-info-settings-panel.tsx

diff --git a/web/src/features/sidebars/world-info/index.tsx b/web/src/features/sidebars/world-info/index.tsx
index 1b002034..4d6a8e6f 100644
--- a/web/src/features/sidebars/world-info/index.tsx
+++ b/web/src/features/sidebars/world-info/index.tsx
@@ -1,4 +1,4 @@
-import { Accordion, Button, Group, NumberInput, Paper, Select, Stack, Switch, Text } from '@mantine/core';
+import { Accordion, Button, Group, Paper, Select, Stack, Text } from '@mantine/core';
 import { useMediaQuery } from '@mantine/hooks';
 import { useUnit } from 'effector-react';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
@@ -38,11 +38,7 @@ import { toaster } from '@ui/toaster';
 import { exportWorldInfoBookToStNative, type WorldInfoSettingsDto } from '../../../api/world-info';
 
 import { WorldInfoEditorModal } from './world-info-editor-modal';
-
-function parseNumberInput(value: string | number, fallback: number): number {
-	if (typeof value === 'number' && Number.isFinite(value)) return value;
-	return fallback;
-}
+import { WorldInfoSettingsPanel } from './world-info-settings-panel';
 
 export const WorldInfoSidebar = () => {
 	const { t } = useTranslation();
@@ -284,72 +280,13 @@ export const WorldInfoSidebar = () => {
 						<Accordion.Item value="world-info-settings">
 							<Accordion.Control>{t('worldInfo.settings.title')}</Accordion.Control>
 							<Accordion.Panel>
-								{!settingsDraft ? (
-									<Text size="sm" c="dimmed">{t('worldInfo.settings.notLoaded')}</Text>
-								) : (
-									<Stack gap="sm">
-										<NumberInput label={t('worldInfo.settings.scanDepth')} min={0} value={settingsDraft.scanDepth ?? 0} onChange={(value) => setSettingsDraft((prev) => ({ ...(prev ?? {}), scanDepth: parseNumberInput(value, 0) }))} />
-										<NumberInput
-											label={t('worldInfo.settings.minActivations')}
-											min={0}
-											value={settingsDraft.minActivations ?? 0}
-											onChange={(value) =>
-												setSettingsDraft((prev) => {
-													const minActivations = parseNumberInput(value, 0);
-													return {
-														...(prev ?? {}),
-														minActivations,
-														maxRecursionSteps:
-															minActivations > 0 ? 0 : (prev?.maxRecursionSteps ?? 0),
-													};
-												})
-											}
-										/>
-										<NumberInput label={t('worldInfo.settings.minDepthMax')} min={0} value={settingsDraft.minDepthMax ?? settingsDraft.minActivationsDepthMax ?? 0} onChange={(value) => setSettingsDraft((prev) => ({ ...(prev ?? {}), minDepthMax: parseNumberInput(value, 0) }))} />
-										<NumberInput
-											label={t('worldInfo.settings.maxRecursionSteps')}
-											min={0}
-											value={settingsDraft.maxRecursionSteps ?? 0}
-											onChange={(value) =>
-												setSettingsDraft((prev) => {
-													const maxRecursionSteps = parseNumberInput(value, 0);
-													return {
-														...(prev ?? {}),
-														maxRecursionSteps,
-														minActivations:
-															maxRecursionSteps > 0 ? 0 : (prev?.minActivations ?? 0),
-													};
-												})
-											}
-										/>
-										<Select
-											label={t('worldInfo.settings.insertionStrategy')}
-											data={[
-												{ value: '0', label: t('worldInfo.settings.insertionStrategyEvenly') },
-												{ value: '1', label: t('worldInfo.settings.insertionStrategyCharacterFirst') },
-												{ value: '2', label: t('worldInfo.settings.insertionStrategyGlobalFirst') },
-											]}
-											value={String(settingsDraft.insertionStrategy ?? settingsDraft.characterStrategy ?? 1)}
-											onChange={(value) =>
-												setSettingsDraft((prev) => ({
-													...(prev ?? {}),
-													insertionStrategy: (Number(value) || 0) as 0 | 1 | 2,
-												}))
-											}
-											comboboxProps={{ withinPortal: false }}
-										/>
-										<NumberInput label={t('worldInfo.settings.budgetPercent')} min={1} max={100} value={settingsDraft.budgetPercent ?? 25} onChange={(value) => setSettingsDraft((prev) => ({ ...(prev ?? {}), budgetPercent: parseNumberInput(value, 25) }))} />
-										<NumberInput label={t('worldInfo.settings.budgetCapTokens')} min={0} value={settingsDraft.budgetCapTokens ?? 0} onChange={(value) => setSettingsDraft((prev) => ({ ...(prev ?? {}), budgetCapTokens: parseNumberInput(value, 0) }))} />
-										<NumberInput label={t('worldInfo.settings.contextWindowTokens')} min={1} value={settingsDraft.contextWindowTokens ?? 8192} onChange={(value) => setSettingsDraft((prev) => ({ ...(prev ?? {}), contextWindowTokens: parseNumberInput(value, 8192) }))} />
-										<Switch label={t('worldInfo.settings.recursive')} checked={Boolean(settingsDraft.recursive)} onChange={(event) => setSettingsDraft((prev) => ({ ...(prev ?? {}), recursive: event.currentTarget.checked }))} />
-										<Switch label={t('worldInfo.settings.overflowAlert')} checked={Boolean(settingsDraft.overflowAlert)} onChange={(event) => setSettingsDraft((prev) => ({ ...(prev ?? {}), overflowAlert: event.currentTarget.checked }))} />
-										<Switch label={t('worldInfo.settings.includeNames')} checked={Boolean(settingsDraft.includeNames)} onChange={(event) => setSettingsDraft((prev) => ({ ...(prev ?? {}), includeNames: event.currentTarget.checked }))} />
-										<Switch label={t('worldInfo.settings.caseSensitive')} checked={Boolean(settingsDraft.caseSensitive)} onChange={(event) => setSettingsDraft((prev) => ({ ...(prev ?? {}), caseSensitive: event.currentTarget.checked }))} />
-										<Switch label={t('worldInfo.settings.matchWholeWords')} checked={Boolean(settingsDraft.matchWholeWords)} onChange={(event) => setSettingsDraft((prev) => ({ ...(prev ?? {}), matchWholeWords: event.currentTarget.checked }))} />
-										<Switch label={t('worldInfo.settings.useGroupScoring')} checked={Boolean(settingsDraft.useGroupScoring)} onChange={(event) => setSettingsDraft((prev) => ({ ...(prev ?? {}), useGroupScoring: event.currentTarget.checked }))} />
-										<Button onClick={handleSaveSettings} loading={isSaveSettingsPending} disabled={isBusy}>{t('worldInfo.actions.saveSettings')}</Button>
-									</Stack>
-								)}
+								<WorldInfoSettingsPanel
+									settingsDraft={settingsDraft}
+									isBusy={isBusy}
+									isSaveSettingsPending={isSaveSettingsPending}
+									onDraftChange={setSettingsDraft}
+									onSave={handleSaveSettings}
+								/>
 							</Accordion.Panel>
 						</Accordion.Item>
 					</Accordion>
diff --git a/web/src/features/sidebars/world-info/world-info-settings-groups.test.ts b/web/src/features/sidebars/world-info/world-info-settings-groups.test.ts
new file mode 100644
index 00000000..0e427394
--- /dev/null
+++ b/web/src/features/sidebars/world-info/world-info-settings-groups.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, test } from 'vitest';
+
+import {
+	WORLD_INFO_SETTINGS_GROUPS,
+	getWorldInfoSettingsFieldIds,
+} from './world-info-settings-groups';
+
+describe('world info settings groups', () => {
+	test('keep all settings fields grouped once', () => {
+		expect(getWorldInfoSettingsFieldIds(WORLD_INFO_SETTINGS_GROUPS)).toEqual([
+			'scanDepth',
+			'includeNames',
+			'caseSensitive',
+			'matchWholeWords',
+			'minActivations',
+			'minDepthMax',
+			'recursive',
+			'maxRecursionSteps',
+			'useGroupScoring',
+			'budgetPercent',
+			'budgetCapTokens',
+			'contextWindowTokens',
+			'overflowAlert',
+			'insertionStrategy',
+		]);
+	});
+
+	test('use unique group and field ids', () => {
+		const groupIds = WORLD_INFO_SETTINGS_GROUPS.map((group) => group.id);
+		const fieldIds = getWorldInfoSettingsFieldIds(WORLD_INFO_SETTINGS_GROUPS);
+
+		expect(new Set(groupIds).size).toBe(groupIds.length);
+		expect(new Set(fieldIds).size).toBe(fieldIds.length);
+	});
+});
diff --git a/web/src/features/sidebars/world-info/world-info-settings-groups.ts b/web/src/features/sidebars/world-info/world-info-settings-groups.ts
new file mode 100644
index 00000000..bf647d63
--- /dev/null
+++ b/web/src/features/sidebars/world-info/world-info-settings-groups.ts
@@ -0,0 +1,53 @@
+export type WorldInfoSettingsFieldId =
+	| 'scanDepth'
+	| 'includeNames'
+	| 'caseSensitive'
+	| 'matchWholeWords'
+	| 'minActivations'
+	| 'minDepthMax'
+	| 'recursive'
+	| 'maxRecursionSteps'
+	| 'useGroupScoring'
+	| 'budgetPercent'
+	| 'budgetCapTokens'
+	| 'contextWindowTokens'
+	| 'overflowAlert'
+	| 'insertionStrategy';
+
+export type WorldInfoSettingsGroup = {
+	id: 'matching' | 'activation' | 'budget' | 'insertion';
+	titleKey: string;
+	descriptionKey: string;
+	fields: WorldInfoSettingsFieldId[];
+};
+
+export const WORLD_INFO_SETTINGS_GROUPS: WorldInfoSettingsGroup[] = [
+	{
+		id: 'matching',
+		titleKey: 'worldInfo.settings.groups.matching.title',
+		descriptionKey: 'worldInfo.settings.groups.matching.description',
+		fields: ['scanDepth', 'includeNames', 'caseSensitive', 'matchWholeWords'],
+	},
+	{
+		id: 'activation',
+		titleKey: 'worldInfo.settings.groups.activation.title',
+		descriptionKey: 'worldInfo.settings.groups.activation.description',
+		fields: ['minActivations', 'minDepthMax', 'recursive', 'maxRecursionSteps', 'useGroupScoring'],
+	},
+	{
+		id: 'budget',
+		titleKey: 'worldInfo.settings.groups.budget.title',
+		descriptionKey: 'worldInfo.settings.groups.budget.description',
+		fields: ['budgetPercent', 'budgetCapTokens', 'contextWindowTokens', 'overflowAlert'],
+	},
+	{
+		id: 'insertion',
+		titleKey: 'worldInfo.settings.groups.insertion.title',
+		descriptionKey: 'worldInfo.settings.groups.insertion.description',
+		fields: ['insertionStrategy'],
+	},
+];
+
+export function getWorldInfoSettingsFieldIds(groups: WorldInfoSettingsGroup[]): WorldInfoSettingsFieldId[] {
+	return groups.flatMap((group) => group.fields);
+}
diff --git a/web/src/features/sidebars/world-info/world-info-settings-panel.tsx b/web/src/features/sidebars/world-info/world-info-settings-panel.tsx
new file mode 100644
index 00000000..dfe19a25
--- /dev/null
+++ b/web/src/features/sidebars/world-info/world-info-settings-panel.tsx
@@ -0,0 +1,226 @@
+import { Button, NumberInput, Select, Stack, Switch, Text } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+
+import {
+	WORLD_INFO_SETTINGS_GROUPS,
+	type WorldInfoSettingsGroup,
+} from './world-info-settings-groups';
+
+import type { WorldInfoSettingsDto } from '../../../api/world-info';
+
+type SettingsDraft = Partial<WorldInfoSettingsDto>;
+type DraftChangeHandler = (updater: (prev: SettingsDraft | null) => SettingsDraft) => void;
+
+type Props = {
+	settingsDraft: SettingsDraft | null;
+	isBusy: boolean;
+	isSaveSettingsPending: boolean;
+	onDraftChange: DraftChangeHandler;
+	onSave: () => void;
+};
+
+type FieldGroupProps = {
+	settingsDraft: SettingsDraft;
+	updateDraft: (patch: SettingsDraft) => void;
+	onDraftChange: DraftChangeHandler;
+};
+
+function parseNumberInput(value: string | number, fallback: number): number {
+	if (typeof value === 'number' && Number.isFinite(value)) return value;
+	return fallback;
+}
+
+function MatchingSettingsFields({ settingsDraft, updateDraft }: FieldGroupProps) {
+	const { t } = useTranslation();
+
+	return (
+		<Stack gap="sm">
+			<NumberInput
+				label={t('worldInfo.settings.scanDepth')}
+				min={0}
+				value={settingsDraft.scanDepth ?? 0}
+				onChange={(value) => updateDraft({ scanDepth: parseNumberInput(value, 0) })}
+			/>
+			<Switch
+				label={t('worldInfo.settings.includeNames')}
+				checked={Boolean(settingsDraft.includeNames)}
+				onChange={(event) => updateDraft({ includeNames: event.currentTarget.checked })}
+			/>
+			<Switch
+				label={t('worldInfo.settings.caseSensitive')}
+				checked={Boolean(settingsDraft.caseSensitive)}
+				onChange={(event) => updateDraft({ caseSensitive: event.currentTarget.checked })}
+			/>
+			<Switch
+				label={t('worldInfo.settings.matchWholeWords')}
+				checked={Boolean(settingsDraft.matchWholeWords)}
+				onChange={(event) => updateDraft({ matchWholeWords: event.currentTarget.checked })}
+			/>
+		</Stack>
+	);
+}
+
+function ActivationSettingsFields({ settingsDraft, updateDraft, onDraftChange }: FieldGroupProps) {
+	const { t } = useTranslation();
+
+	return (
+		<Stack gap="sm">
+			<NumberInput
+				label={t('worldInfo.settings.minActivations')}
+				min={0}
+				value={settingsDraft.minActivations ?? 0}
+				onChange={(value) => {
+					const minActivations = parseNumberInput(value, 0);
+					onDraftChange((prev) => ({
+						...(prev ?? {}),
+						minActivations,
+						maxRecursionSteps: minActivations > 0 ? 0 : (prev?.maxRecursionSteps ?? 0),
+					}));
+				}}
+			/>
+			<NumberInput
+				label={t('worldInfo.settings.minDepthMax')}
+				min={0}
+				value={settingsDraft.minDepthMax ?? settingsDraft.minActivationsDepthMax ?? 0}
+				onChange={(value) => updateDraft({ minDepthMax: parseNumberInput(value, 0) })}
+			/>
+			<Switch
+				label={t('worldInfo.settings.recursive')}
+				checked={Boolean(settingsDraft.recursive)}
+				onChange={(event) => updateDraft({ recursive: event.currentTarget.checked })}
+			/>
+			<NumberInput
+				label={t('worldInfo.settings.maxRecursionSteps')}
+				min={0}
+				value={settingsDraft.maxRecursionSteps ?? 0}
+				onChange={(value) => {
+					const maxRecursionSteps = parseNumberInput(value, 0);
+					onDraftChange((prev) => ({
+						...(prev ?? {}),
+						maxRecursionSteps,
+						minActivations: maxRecursionSteps > 0 ? 0 : (prev?.minActivations ?? 0),
+					}));
+				}}
+			/>
+			<Switch
+				label={t('worldInfo.settings.useGroupScoring')}
+				checked={Boolean(settingsDraft.useGroupScoring)}
+				onChange={(event) => updateDraft({ useGroupScoring: event.currentTarget.checked })}
+			/>
+		</Stack>
+	);
+}
+
+function BudgetSettingsFields({ settingsDraft, updateDraft }: FieldGroupProps) {
+	const { t } = useTranslation();
+
+	return (
+		<Stack gap="sm">
+			<NumberInput
+				label={t('worldInfo.settings.budgetPercent')}
+				min={1}
+				max={100}
+				value={settingsDraft.budgetPercent ?? 25}
+				onChange={(value) => updateDraft({ budgetPercent: parseNumberInput(value, 25) })}
+			/>
+			<NumberInput
+				label={t('worldInfo.settings.budgetCapTokens')}
+				min={0}
+				value={settingsDraft.budgetCapTokens ?? 0}
+				onChange={(value) => updateDraft({ budgetCapTokens: parseNumberInput(value, 0) })}
+			/>
+			<NumberInput
+				label={t('worldInfo.settings.contextWindowTokens')}
+				min={1}
+				value={settingsDraft.contextWindowTokens ?? 8192}
+				onChange={(value) => updateDraft({ contextWindowTokens: parseNumberInput(value, 8192) })}
+			/>
+			<Switch
+				label={t('worldInfo.settings.overflowAlert')}
+				checked={Boolean(settingsDraft.overflowAlert)}
+				onChange={(event) => updateDraft({ overflowAlert: event.currentTarget.checked })}
+			/>
+		</Stack>
+	);
+}
+
+function InsertionSettingsFields({ settingsDraft, updateDraft }: FieldGroupProps) {
+	const { t } = useTranslation();
+
+	return (
+		<Select
+			label={t('worldInfo.settings.insertionStrategy')}
+			data={[
+				{ value: '0', label: t('worldInfo.settings.insertionStrategyEvenly') },
+				{ value: '1', label: t('worldInfo.settings.insertionStrategyCharacterFirst') },
+				{ value: '2', label: t('worldInfo.settings.insertionStrategyGlobalFirst') },
+			]}
+			value={String(settingsDraft.insertionStrategy ?? settingsDraft.characterStrategy ?? 1)}
+			onChange={(value) => updateDraft({ insertionStrategy: (Number(value) || 0) as 0 | 1 | 2 })}
+			comboboxProps={{ withinPortal: false }}
+		/>
+	);
+}
+
+function WorldInfoSettingsGroupFields(props: FieldGroupProps & { group: WorldInfoSettingsGroup }) {
+	switch (props.group.id) {
+		case 'matching':
+			return <MatchingSettingsFields {...props} />;
+		case 'activation':
+			return <ActivationSettingsFields {...props} />;
+		case 'budget':
+			return <BudgetSettingsFields {...props} />;
+		case 'insertion':
+			return <InsertionSettingsFields {...props} />;
+		default:
+			return null;
+	}
+}
+
+export function WorldInfoSettingsPanel({
+	settingsDraft,
+	isBusy,
+	isSaveSettingsPending,
+	onDraftChange,
+	onSave,
+}: Props) {
+	const { t } = useTranslation();
+
+	const updateDraft = (patch: SettingsDraft) => {
+		onDraftChange((prev) => ({ ...(prev ?? {}), ...patch }));
+	};
+
+	if (!settingsDraft) {
+		return (
+			<Text size="sm" c="dimmed">
+				{t('worldInfo.settings.notLoaded')}
+			</Text>
+		);
+	}
+
+	return (
+		<Stack gap="md">
+			{WORLD_INFO_SETTINGS_GROUPS.map((group) => (
+				<Stack key={group.id} gap="xs">
+					<Stack gap={2}>
+						<Text size="sm" fw={600}>
+							{t(group.titleKey)}
+						</Text>
+						<Text size="xs" c="dimmed">
+							{t(group.descriptionKey)}
+						</Text>
+					</Stack>
+					<WorldInfoSettingsGroupFields
+						group={group}
+						settingsDraft={settingsDraft}
+						updateDraft={updateDraft}
+						onDraftChange={onDraftChange}
+					/>
+				</Stack>
+			))}
+			<Button onClick={onSave} loading={isSaveSettingsPending} disabled={isBusy}>
+				{t('worldInfo.actions.saveSettings')}
+			</Button>
+		</Stack>
+	);
+}
diff --git a/web/src/i18n/resources/en/worldInfo.ts b/web/src/i18n/resources/en/worldInfo.ts
index 85c699e1..d6c579fb 100644
--- a/web/src/i18n/resources/en/worldInfo.ts
+++ b/web/src/i18n/resources/en/worldInfo.ts
@@ -25,6 +25,24 @@
 			settings: {
 				title: 'World Info settings',
 				notLoaded: 'Settings are not loaded.',
+				groups: {
+					matching: {
+						title: 'Matching',
+						description: 'Which messages and World Info keys are used for matching.',
+					},
+					activation: {
+						title: 'Entry activation',
+						description: 'When entries are considered active and how recursion works.',
+					},
+					budget: {
+						title: 'Context budget',
+						description: 'How much prompt space World Info can use.',
+					},
+					insertion: {
+						title: 'Prompt insertion',
+						description: 'How activated entries are distributed while building context.',
+					},
+				},
 				scanDepth: 'Scan depth',
 				minActivations: 'Min activations',
 				minDepthMax: 'Min depth max',
diff --git a/web/src/i18n/resources/ru/worldInfo.ts b/web/src/i18n/resources/ru/worldInfo.ts
index 513d0464..56cc675a 100644
--- a/web/src/i18n/resources/ru/worldInfo.ts
+++ b/web/src/i18n/resources/ru/worldInfo.ts
@@ -25,23 +25,41 @@
 			settings: {
 				title: 'Настройки World Info',
 				notLoaded: 'Настройки не загружены.',
-				scanDepth: 'Scan depth',
-				minActivations: 'Min activations',
-				minDepthMax: 'Min depth max',
-				maxRecursionSteps: 'Max recursion steps',
-				insertionStrategy: 'Insertion strategy',
-				insertionStrategyEvenly: 'Evenly',
-				insertionStrategyCharacterFirst: 'Character first',
-				insertionStrategyGlobalFirst: 'Global first',
-				budgetPercent: 'Budget percent',
-				budgetCapTokens: 'Budget cap tokens',
-				contextWindowTokens: 'Context window tokens',
-				recursive: 'Recursive',
-				overflowAlert: 'Overflow alert',
-				includeNames: 'Include names',
-				caseSensitive: 'Case sensitive',
-				matchWholeWords: 'Match whole words',
-				useGroupScoring: 'Use group scoring',
+				groups: {
+					matching: {
+						title: 'Поиск совпадений',
+						description: 'Какие сообщения и ключи World Info участвуют в поиске.',
+					},
+					activation: {
+						title: 'Активация записей',
+						description: 'Когда записи считаются найденными и как работает рекурсия.',
+					},
+					budget: {
+						title: 'Бюджет контекста',
+						description: 'Сколько места World Info может занять в промпте.',
+					},
+					insertion: {
+						title: 'Вставка в промпт',
+						description: 'Как активированные записи распределяются при сборке контекста.',
+					},
+				},
+				scanDepth: 'Глубина сканирования',
+				minActivations: 'Минимум активаций',
+				minDepthMax: 'Максимальная глубина минимума',
+				maxRecursionSteps: 'Максимум шагов рекурсии',
+				insertionStrategy: 'Стратегия вставки',
+				insertionStrategyEvenly: 'Равномерно',
+				insertionStrategyCharacterFirst: 'Сначала персонаж',
+				insertionStrategyGlobalFirst: 'Сначала глобальные записи',
+				budgetPercent: 'Бюджет, % контекста',
+				budgetCapTokens: 'Лимит бюджета в токенах',
+				contextWindowTokens: 'Размер окна контекста',
+				recursive: 'Рекурсивный поиск',
+				overflowAlert: 'Предупреждать о переполнении',
+				includeNames: 'Искать по именам',
+				caseSensitive: 'Учитывать регистр',
+				matchWholeWords: 'Только целые слова',
+				useGroupScoring: 'Использовать оценку групп',
 			},
 			confirm: {
 				deleteBook: 'Удалить выбранную World Info книгу?',

From 0b3506547d31bab2b0f13bf258288763ddbbc33d Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Mon, 20 Apr 2026 22:06:59 +0300
Subject: [PATCH 41/54] Improve operation block validation and editor sync

---
 web/src/api/api-error.test.ts                 |  72 +++++++++++-
 web/src/api/api-error.ts                      | 108 +++++++++++++++++-
 .../form/operation-block-form-values.ts       |  21 ++++
 .../operation-profile-form-mapping.test.ts    |  16 ++-
 .../form/operation-profile-form-mapping.ts    |  11 +-
 .../sidebars/operation-profiles/index.tsx     |  17 ++-
 .../node-editor/block-node-editor-modal.tsx   |  83 +++++---------
 .../operation-block-editor.tsx                |  87 +++++++-------
 .../i18n/resources/en/operationProfiles.ts    |  32 ++++++
 .../i18n/resources/ru/operationProfiles.ts    |  32 ++++++
 10 files changed, 366 insertions(+), 113 deletions(-)
 create mode 100644 web/src/features/sidebars/operation-profiles/form/operation-block-form-values.ts

diff --git a/web/src/api/api-error.test.ts b/web/src/api/api-error.test.ts
index 195758f6..6c9ba1de 100644
--- a/web/src/api/api-error.test.ts
+++ b/web/src/api/api-error.test.ts
@@ -1,8 +1,14 @@
-import { describe, expect, it } from 'vitest';
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import i18n from '../i18n';
 
 import { getApiErrorMessage } from './api-error';
 
 describe('getApiErrorMessage', () => {
+	beforeEach(async () => {
+		await i18n.changeLanguage('en');
+	});
+
 	it('formats flat zod issues into a readable message', () => {
 		const message = getApiErrorMessage(
 			{
@@ -22,7 +28,67 @@ describe('getApiErrorMessage', () => {
 			400,
 		);
 
-		expect(message).toBe('operations[0].config.activation: activation must include at least one interval');
+		expect(message).toBe('Operation #1 activation: must include at least one interval');
+	});
+
+	it('formats operation validation issues with readable operation fields and keeps all issues', () => {
+		const message = getApiErrorMessage(
+			{
+				error: {
+					message: 'Validation error',
+					code: 'VALIDATION_ERROR',
+					details: {
+						issues: [
+							{
+								path: ['operations', 0, 'config', 'params', 'params', 'credentialRef'],
+								message: 'Too small: expected string to have >=1 characters',
+							},
+							{
+								path: ['operations', 0, 'config', 'params', 'params', 'prompt'],
+								message: 'Too small: expected string to have >=1 characters',
+							},
+							{
+								path: ['operations', 0, 'config', 'params', 'artifact', 'tag'],
+								message: 'tag must match ^[a-z][a-z0-9_]*$',
+							},
+							{
+								path: ['operations', 0, 'config', 'params', 'artifact', 'title'],
+								message: 'Too small: expected string to have >=1 characters',
+							},
+						],
+					},
+				},
+			},
+			400,
+		);
+
+		expect(message).toBe(
+			'Operation #1 LLM token: required; Operation #1 prompt: required; Operation #1 artifact tag: must match ^[a-z][a-z0-9_]*$; Operation #1 artifact title: required',
+		);
+	});
+
+	it('localizes readable operation validation labels', async () => {
+		await i18n.changeLanguage('ru');
+
+		const message = getApiErrorMessage(
+			{
+				error: {
+					message: 'Validation error',
+					code: 'VALIDATION_ERROR',
+					details: {
+						issues: [
+							{
+								path: ['operations', 1, 'config', 'params', 'params', 'credentialRef'],
+								message: 'Too small: expected string to have >=1 characters',
+							},
+						],
+					},
+				},
+			},
+			400,
+		);
+
+		expect(message).toBe('Операция #2 LLM токен: обязательное поле');
 	});
 
 	it('formats request validation issues grouped by source', () => {
@@ -49,7 +115,7 @@ describe('getApiErrorMessage', () => {
 			400,
 		);
 
-		expect(message).toBe('body.input.name: Too small: expected string to have >=1 characters');
+		expect(message).toBe('body.input.name: required');
 	});
 
 	it('keeps specific non-validation messages', () => {
diff --git a/web/src/api/api-error.ts b/web/src/api/api-error.ts
index 8dacb34a..cffb43c2 100644
--- a/web/src/api/api-error.ts
+++ b/web/src/api/api-error.ts
@@ -1,3 +1,5 @@
+import i18n from '../i18n';
+
 type ApiErrorEnvelope = {
 	error?: {
 		message?: string;
@@ -17,7 +19,7 @@ type ApiIssueGroup = {
 };
 
 const GENERIC_VALIDATION_MESSAGE = 'validation error';
-const MAX_ISSUES_IN_MESSAGE = 3;
+const REQUIRED_STRING_MESSAGE = 'Too small: expected string to have >=1 characters';
 
 export function getApiErrorMessage(body: ApiErrorEnvelope | undefined, status: number): string {
 	const fallbackMessage = body?.error?.message ?? `HTTP error ${status}`;
@@ -62,14 +64,11 @@ function formatValidationDetails(details: unknown): string | null {
 		return null;
 	}
 
-	const visibleIssues = formattedIssues.slice(0, MAX_ISSUES_IN_MESSAGE);
-	const remainingCount = formattedIssues.length - visibleIssues.length;
-
-	return remainingCount > 0 ? `${visibleIssues.join('; ')}; +${remainingCount} more` : visibleIssues.join('; ');
+	return formattedIssues.join('; ');
 }
 
 function formatIssue(issue: ApiIssue, source?: string): string | null {
-	const message = typeof issue.message === 'string' ? issue.message.trim() : '';
+	const message = formatIssueMessage(issue);
 	if (!message) {
 		return null;
 	}
@@ -79,6 +78,9 @@ function formatIssue(issue: ApiIssue, source?: string): string | null {
 }
 
 function formatIssuePath(path: unknown[] | undefined, source?: string): string | null {
+	const operationPath = formatOperationIssuePath(path);
+	if (operationPath) return operationPath;
+
 	let result = typeof source === 'string' && source.length > 0 ? source : '';
 
 	for (const segment of path ?? []) {
@@ -95,6 +97,100 @@ function formatIssuePath(path: unknown[] | undefined, source?: string): string |
 	return result || null;
 }
 
+function formatOperationIssuePath(path: unknown[] | undefined): string | null {
+	if (!Array.isArray(path)) return null;
+	const operationsIndex = path.findIndex((segment) => segment === 'operations');
+	const operationNumber = path[operationsIndex + 1];
+	if (operationsIndex < 0 || typeof operationNumber !== 'number' || !Number.isInteger(operationNumber)) {
+		return null;
+	}
+
+	const fieldPath = path.slice(operationsIndex + 2);
+	const fieldLabel = formatOperationFieldPath(fieldPath);
+	const operationLabel = t('operation', 'Operation #{{number}}', { number: operationNumber + 1 });
+	return fieldLabel ? `${operationLabel} ${fieldLabel}` : operationLabel;
+}
+
+function formatOperationFieldPath(path: unknown[]): string {
+	const normalized = normalizeOperationFieldPath(path);
+	const key = normalized.join('.');
+	const label = OPERATION_FIELD_LABELS[key];
+	if (label) return t(`fields.${label.key}`, label.fallback);
+	return normalized.map(formatFieldSegment).join(' ');
+}
+
+function normalizeOperationFieldPath(path: unknown[]): string[] {
+	const result: string[] = [];
+	for (let index = 0; index < path.length; index += 1) {
+		const segment = path[index];
+		if (typeof segment === 'number' && Number.isInteger(segment)) {
+			result.push(`#${segment + 1}`);
+			continue;
+		}
+		if (typeof segment !== 'string' || segment.length === 0) continue;
+		if (segment === 'config') continue;
+		if (segment === 'params') continue;
+		result.push(segment);
+	}
+	return result;
+}
+
+function formatFieldSegment(segment: string): string {
+	if (segment.startsWith('#')) return segment;
+	return segment
+		.replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+		.replace(/_/g, ' ')
+		.toLowerCase();
+}
+
+function formatIssueMessage(issue: ApiIssue): string {
+	const raw = typeof issue.message === 'string' ? issue.message.trim() : '';
+	if (!raw) return '';
+	if (raw === REQUIRED_STRING_MESSAGE) return t('required', 'required');
+
+	const leaf = Array.isArray(issue.path) ? issue.path[issue.path.length - 1] : undefined;
+	if (typeof leaf === 'string' && raw.toLowerCase().startsWith(`${formatFieldSegment(leaf)} must `)) {
+		return raw.slice(formatFieldSegment(leaf).length + 1);
+	}
+	return raw;
+}
+
+function t(key: string, fallback: string, options?: Record<string, unknown>): string {
+	return i18n.t(`operationProfiles.validation.${key}`, {
+		defaultValue: fallback,
+		...(options ?? {}),
+	});
+}
+
+const OPERATION_FIELD_LABELS: Record<string, { key: string; fallback: string }> = {
+	activation: { key: 'activation', fallback: 'activation' },
+	dependsOn: { key: 'dependsOn', fallback: 'dependencies' },
+	hooks: { key: 'hooks', fallback: 'hooks' },
+	name: { key: 'name', fallback: 'name' },
+	order: { key: 'order', fallback: 'order' },
+	required: { key: 'required', fallback: 'required flag' },
+	runConditions: { key: 'runConditions', fallback: 'run conditions' },
+	triggers: { key: 'triggers', fallback: 'triggers' },
+	credentialRef: { key: 'credentialRef', fallback: 'LLM token' },
+	model: { key: 'model', fallback: 'model' },
+	prompt: { key: 'prompt', fallback: 'prompt' },
+	system: { key: 'system', fallback: 'system prompt' },
+	jsonSchema: { key: 'jsonSchema', fallback: 'JSON schema' },
+	jsonCustomPattern: { key: 'jsonCustomPattern', fallback: 'JSON regex pattern' },
+	jsonCustomFlags: { key: 'jsonCustomFlags', fallback: 'JSON regex flags' },
+	'artifact.artifactId': { key: 'artifactId', fallback: 'artifact id' },
+	'artifact.description': { key: 'artifactDescription', fallback: 'artifact description' },
+	'artifact.exposures': { key: 'artifactExposures', fallback: 'artifact exposures' },
+	'artifact.format': { key: 'artifactFormat', fallback: 'artifact format' },
+	'artifact.history.enabled': { key: 'artifactHistoryEnabled', fallback: 'artifact history enabled' },
+	'artifact.history.maxItems': { key: 'artifactHistoryMaxItems', fallback: 'artifact history limit' },
+	'artifact.persistence': { key: 'artifactPersistence', fallback: 'artifact persistence' },
+	'artifact.semantics': { key: 'artifactSemantics', fallback: 'artifact semantics' },
+	'artifact.tag': { key: 'artifactTag', fallback: 'artifact tag' },
+	'artifact.title': { key: 'artifactTitle', fallback: 'artifact title' },
+	'artifact.writeMode': { key: 'artifactWriteMode', fallback: 'artifact write mode' },
+};
+
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === 'object' && value !== null;
 }
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-block-form-values.ts b/web/src/features/sidebars/operation-profiles/form/operation-block-form-values.ts
new file mode 100644
index 00000000..362ba547
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/form/operation-block-form-values.ts
@@ -0,0 +1,21 @@
+import { toOperationProfileForm, type OperationProfileFormValues } from './operation-profile-form-mapping';
+
+import type { OperationBlockDto, OperationProfileDto } from '../../../../api/chat-core';
+
+export function toOperationBlockFormValues(block: OperationBlockDto): OperationProfileFormValues {
+	return toOperationProfileForm({
+		profileId: block.blockId,
+		ownerId: block.ownerId,
+		name: block.name,
+		description: block.description,
+		enabled: block.enabled,
+		executionMode: 'sequential',
+		operationProfileSessionId: '00000000-0000-0000-0000-000000000000',
+		blockRefs: [],
+		operations: block.operations,
+		meta: block.meta,
+		version: block.version,
+		createdAt: block.createdAt,
+		updatedAt: block.updatedAt,
+	} satisfies OperationProfileDto);
+}
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
index 005c5741..082fe8a6 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.test.ts
@@ -1,7 +1,12 @@
 import { describe, expect, it } from 'vitest';
 
 import { makeDefaultGuardKindParams } from './guard-kind-form';
-import { fromOperationProfileForm, toOperationProfileForm, type OperationProfileFormValues } from './operation-profile-form-mapping';
+import {
+	fromOperationProfileForm,
+	makeDefaultOperation,
+	toOperationProfileForm,
+	type OperationProfileFormValues,
+} from './operation-profile-form-mapping';
 
 import type { OperationProfileDto } from '../../../../api/chat-core';
 import type { OperationArtifactConfig } from '@shared/types/operation-profiles';
@@ -24,6 +29,15 @@ function makeArtifact(overrides?: Partial<OperationArtifactConfig>) {
 }
 
 describe('operation profile form mapping', () => {
+	it('creates new operations with unique art-prefixed artifact tags', () => {
+		const first = makeDefaultOperation();
+		const second = makeDefaultOperation();
+
+		expect(first.config.params.artifact.tag).toMatch(/^art_[a-z0-9]+$/);
+		expect(second.config.params.artifact.tag).toMatch(/^art_[a-z0-9]+$/);
+		expect(first.config.params.artifact.tag).not.toBe(second.config.params.artifact.tag);
+	});
+
 	it('creates guard defaults with a valid output contract', () => {
 		const params = makeDefaultGuardKindParams('guard-1');
 
diff --git a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
index b198e7b9..acb5620d 100644
--- a/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
+++ b/web/src/features/sidebars/operation-profiles/form/operation-profile-form-mapping.ts
@@ -96,12 +96,21 @@ export type OperationProfileFormValues = {
 	operations: FormOperation[];
 };
 
+function makeDefaultArtifactTag(opId: string): string {
+	const suffix = opId.replace(/[^a-zA-Z0-9]/g, '').toLowerCase().slice(0, 10) || uuidv4().replace(/-/g, '').slice(0, 10);
+	return `art_${suffix}`;
+}
+
 export function makeDefaultArtifactOutput(opId = uuidv4(), kind: OperationKind = 'template'): OperationArtifactConfig {
-	return makeDefaultOperationArtifactConfig({
+	const artifact = makeDefaultOperationArtifactConfig({
 		opId,
 		kind,
 		title: 'Artifact',
 	});
+	return {
+		...artifact,
+		tag: makeDefaultArtifactTag(opId),
+	};
 }
 
 export function makeDefaultLlmKindParams(
diff --git a/web/src/features/sidebars/operation-profiles/index.tsx b/web/src/features/sidebars/operation-profiles/index.tsx
index 2ba96bdb..923f840a 100644
--- a/web/src/features/sidebars/operation-profiles/index.tsx
+++ b/web/src/features/sidebars/operation-profiles/index.tsx
@@ -31,7 +31,6 @@ import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
 import { exportBundle, importBundle } from '../../../api/bundles';
 import { resolveBundleAutoApplyTargets } from '../common/bundle-helpers';
 
-import { OperationBlockNodeEditorModal } from './node-editor/block-node-editor-modal';
 import { OperationBlockEditor, type OperationBlockToolbarState } from './operation-block-editor';
 import { OperationProfileBlocksEditor, type OperationProfileBlocksToolbarState } from './operation-profile-blocks-editor';
 import './operation-profiles.css';
@@ -367,18 +366,16 @@ export const OperationProfilesSidebar: React.FC = () => {
 								{t('operationProfiles.blocks.emptySelectBlock')}
 							</Text>
 						) : (
-							<OperationBlockEditor block={selectedBlock} preferSplitLayout={preferSplitLayout} onToolbarStateChange={setBlockToolbarState} />
+							<OperationBlockEditor
+								block={selectedBlock}
+								preferSplitLayout={preferSplitLayout}
+								nodeEditorOpened={isNodeEditorOpen}
+								onNodeEditorClose={() => setIsNodeEditorOpen(false)}
+								onToolbarStateChange={setBlockToolbarState}
+							/>
 						)}
 					</>
 				)}
-
-				{selectedBlock && (
-					<OperationBlockNodeEditorModal
-						opened={isNodeEditorOpen}
-						onClose={() => setIsNodeEditorOpen(false)}
-						block={selectedBlock}
-					/>
-				)}
 			</Stack>
 		</Drawer>
 	);
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
index c85e8d88..762c3c18 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
@@ -11,21 +11,14 @@ import {
 	type ReactFlowInstance,
 	useNodesState,
 } from '@xyflow/react';
-import { useUnit } from 'effector-react';
 import React, { useCallback, useDeferredValue, useEffect, useMemo, useRef, useState } from 'react';
-import { FormProvider, useFieldArray, useForm, useWatch } from 'react-hook-form';
+import { FormProvider, useFieldArray, useWatch, type UseFormReturn } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { v4 as uuidv4 } from 'uuid';
 
-import { updateOperationBlockFx } from '@model/operation-blocks';
 import { Z_INDEX } from '@ui/z-index';
 
-import {
-	fromOperationProfileForm,
-	makeDefaultOperation,
-	toOperationProfileForm,
-	type OperationProfileFormValues,
-} from '../form/operation-profile-form-mapping';
+import { makeDefaultOperation, type OperationProfileFormValues } from '../form/operation-profile-form-mapping';
 
 import { buildOperationFlowNodeData, buildOperationFlowNodeSignature } from './flow/operation-flow-node-model';
 import { buildGraphOperations, buildGraphWatchPaths } from './graph-form-state';
@@ -47,13 +40,16 @@ import { DEFAULT_GROUP_COLOR_HEX, normalizeCssColorToOpaqueRgbString } from './u
 
 import type { OperationFlowNodeData } from './flow/operation-flow-node';
 import type { EditorGroup } from './ui/group-overlays';
-import type { OperationBlockDto, OperationProfileDto } from '../../../../api/chat-core';
+import type { OperationBlockDto } from '../../../../api/chat-core';
 import type { NodeEditorViewState } from '../ui/types';
 
 type Props = {
 	opened: boolean;
 	onClose: () => void;
 	block: OperationBlockDto;
+	form: UseFormReturn<OperationProfileFormValues>;
+	initialValues: OperationProfileFormValues;
+	onSaveDraft: (values: OperationProfileFormValues, meta?: unknown) => Promise<void>;
 };
 
 type OpEdge = { source: string; target: string };
@@ -77,31 +73,17 @@ function isTextEditingTarget(target: EventTarget | null): boolean {
 	return Boolean(target.closest?.('[contenteditable="true"]'));
 }
 
-function toFormValuesFromBlock(block: OperationBlockDto): OperationProfileFormValues {
-	return toOperationProfileForm({
-		profileId: block.blockId,
-		ownerId: block.ownerId,
-		name: block.name,
-		description: block.description,
-		enabled: block.enabled,
-		executionMode: 'sequential',
-		operationProfileSessionId: '00000000-0000-0000-0000-000000000000',
-		blockRefs: [],
-		operations: block.operations,
-		meta: block.meta,
-		version: block.version,
-		createdAt: block.createdAt,
-		updatedAt: block.updatedAt,
-	} satisfies OperationProfileDto);
-}
-
-export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose, block }) => {
+export const OperationBlockNodeEditorModal: React.FC<Props> = ({
+	opened,
+	onClose,
+	block,
+	form: methods,
+	initialValues,
+	onSaveDraft,
+}) => {
 	const { t } = useTranslation();
-	const doUpdate = useUnit(updateOperationBlockFx);
 	const isCompactLayout = useMediaQuery('(max-width: 1024px)');
 
-	const initial = useMemo(() => toFormValuesFromBlock(block), [block]);
-	const methods = useForm<OperationProfileFormValues>({ defaultValues: initial });
 	const { control, reset: resetForm } = methods;
 
 	const { fields, append, replace } = useFieldArray({ name: 'operations', control, keyName: '_key' });
@@ -126,7 +108,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 
 	const resetToInitialState = useCallback(() => {
 		setJsonError(null);
-		resetForm(initial);
+		resetForm(initialValues);
 		setSelectedOpId(null);
 		setSelectedNodeIds([]);
 		const metaGroups = readNodeEditorMeta(block.meta)?.groups ?? {};
@@ -138,9 +120,9 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 		setIsInspectorVisible(true);
 
 		const meta = readNodeEditorMeta(block.meta);
-		const resetEdges = buildOperationGraphEdges(initial.operations);
-		const resetFallbackPositions = computeSimpleLayout(extractOpIds(initial), edgesToDeps(resetEdges));
-		const nextNodes: Array<Node<OperationFlowNodeData>> = initial.operations.map((op) => {
+		const resetEdges = buildOperationGraphEdges(initialValues.operations);
+		const resetFallbackPositions = computeSimpleLayout(extractOpIds(initialValues), edgesToDeps(resetEdges));
+		const nextNodes: Array<Node<OperationFlowNodeData>> = initialValues.operations.map((op) => {
 			const pos = meta?.nodes?.[op.opId] ?? resetFallbackPositions[op.opId] ?? { x: 0, y: 0 };
 			return {
 				id: op.opId,
@@ -151,11 +133,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 			};
 		});
 		setNodes(nextNodes);
-	}, [initial, block.meta, resetForm, setNodes]);
-
-	useEffect(() => {
-		resetToInitialState();
-	}, [resetToInitialState]);
+	}, [initialValues, block.meta, resetForm, setNodes]);
 
 	const areStringArraysEqual = useCallback((a: string[], b: string[]) => {
 		if (a === b) return true;
@@ -193,6 +171,16 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 	// Initialize nodes on open / profile change.
 	useEffect(() => {
 		if (!opened) return;
+		setJsonError(null);
+		setSelectedOpId(null);
+		setSelectedNodeIds([]);
+		setGroups(readNodeEditorMeta(block.meta)?.groups ?? {});
+		setSelectedGroupId(null);
+		setGroupEditor(null);
+		setIsLayoutDirty(false);
+		setViewState('graph');
+		setIsInspectorVisible(true);
+
 		const meta = readNodeEditorMeta(block.meta);
 		const initialNodes: Array<Node<OperationFlowNodeData>> = nodeDrafts.map((draft) => {
 			const pos = meta?.nodes?.[draft.opId] ?? fallbackPositions[draft.opId] ?? { x: 0, y: 0 };
@@ -274,7 +262,6 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 	const onSave = methods.handleSubmit(async (values) => {
 		setJsonError(null);
 		try {
-			const payload = fromOperationProfileForm(values, { validateJson: true });
 			const nodesMap: Record<string, { x: number; y: number }> = {};
 			for (const n of nodes) {
 				nodesMap[String(n.id)] = { x: n.position.x, y: n.position.y };
@@ -293,17 +280,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({ opened, onClose
 				nodes: nodesMap,
 				groups: Object.keys(groupsToSave).length ? groupsToSave : undefined,
 			};
-			const updatedBlock = await doUpdate({
-				blockId: block.blockId,
-				patch: {
-					name: payload.name,
-					description: payload.description,
-					enabled: payload.enabled,
-					operations: payload.operations,
-					meta: writeNodeEditorMeta(block.meta, nodeEditorMeta),
-				},
-			});
-			resetForm(toFormValuesFromBlock(updatedBlock));
+			await onSaveDraft(values, writeNodeEditorMeta(block.meta, nodeEditorMeta));
 			setIsLayoutDirty(false);
 		} catch (e) {
 			setJsonError(e instanceof Error ? e.message : String(e));
diff --git a/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx b/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
index fa395279..7a386b4e 100644
--- a/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
+++ b/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
@@ -9,19 +9,23 @@ import { LuChevronDown, LuChevronUp, LuPlus } from 'react-icons/lu';
 import { updateOperationBlockFx } from '@model/operation-blocks';
 import { FormInput, FormSwitch } from '@ui/form-components';
 
-import { fromOperationProfileForm, makeDefaultOperation, toOperationProfileForm, type OperationProfileFormValues } from './form/operation-profile-form-mapping';
+import { toOperationBlockFormValues } from './form/operation-block-form-values';
+import { fromOperationProfileForm, makeDefaultOperation, type OperationProfileFormValues } from './form/operation-profile-form-mapping';
+import { OperationBlockNodeEditorModal } from './node-editor/block-node-editor-modal';
 import { OperationEditor } from './ui/operation-editor/operation-editor';
 import { OperationList } from './ui/operation-list';
 import { getOperationListLayout } from './ui/operation-list-layout';
 import { isOperationKind } from './utils/operation-kind';
 
 import type { OperationListRowMeta } from './ui/types';
-import type { OperationBlockDto, OperationProfileDto } from '../../../api/chat-core';
+import type { OperationBlockDto } from '../../../api/chat-core';
 import type { OperationKind } from '@shared/types/operation-profiles';
 
 type Props = {
 	block: OperationBlockDto;
 	preferSplitLayout: boolean;
+	nodeEditorOpened?: boolean;
+	onNodeEditorClose?: () => void;
 	onToolbarStateChange?: (state: OperationBlockToolbarState | null) => void;
 };
 
@@ -67,24 +71,6 @@ const SelectedOperationEditor: React.FC<SelectedOperationEditorProps> = React.me
 
 SelectedOperationEditor.displayName = 'SelectedOperationEditor';
 
-function toFormValuesFromBlock(block: OperationBlockDto): OperationProfileFormValues {
-	return toOperationProfileForm({
-		profileId: block.blockId,
-		ownerId: block.ownerId,
-		name: block.name,
-		description: block.description,
-		enabled: block.enabled,
-		executionMode: 'sequential',
-		operationProfileSessionId: '00000000-0000-0000-0000-000000000000',
-		blockRefs: [],
-		operations: block.operations,
-		meta: block.meta,
-		version: block.version,
-		createdAt: block.createdAt,
-		updatedAt: block.updatedAt,
-	} satisfies OperationProfileDto);
-}
-
 function resolveEditingOperationId(preferredOpId: string | null, operations: OperationProfileFormValues['operations']): string | null {
 	if (preferredOpId && operations.some((operation) => operation.opId === preferredOpId)) return preferredOpId;
 	return operations[0]?.opId ?? null;
@@ -121,14 +107,20 @@ function areDeepEqual(left: unknown, right: unknown): boolean {
 	return false;
 }
 
-export const OperationBlockEditor: React.FC<Props> = ({ block, preferSplitLayout, onToolbarStateChange }) => {
+export const OperationBlockEditor: React.FC<Props> = ({
+	block,
+	preferSplitLayout,
+	nodeEditorOpened = false,
+	onNodeEditorClose,
+	onToolbarStateChange,
+}) => {
 	const { t } = useTranslation();
 	const doUpdate = useUnit(updateOperationBlockFx);
 	const isMobile = useMediaQuery('(max-width: 767px)');
 	const useSplitLayout = preferSplitLayout && !isMobile;
 	const operationListLayout = useMemo(() => getOperationListLayout(useSplitLayout), [useSplitLayout]);
 
-	const initial = useMemo(() => toFormValuesFromBlock(block), [block]);
+	const initial = useMemo(() => toOperationBlockFormValues(block), [block]);
 	const methods = useForm<OperationProfileFormValues>({ defaultValues: initial });
 	const { control, reset } = methods;
 	const watchedValues = useWatch({ control });
@@ -182,36 +174,44 @@ export const OperationBlockEditor: React.FC<Props> = ({ block, preferSplitLayout
 	const selectedRow = selectedIndex === null ? null : rows.find((row) => row.index === selectedIndex) ?? null;
 	const selectedOpId = selectedRow?.opId ?? null;
 
-	const submitValues = useCallback(
-		async (values: OperationProfileFormValues) => {
+	const saveBlockDraft = useCallback(
+		async (values: OperationProfileFormValues, meta?: unknown) => {
 			setJsonError(null);
 			let payload: ReturnType<typeof fromOperationProfileForm>;
 			try {
 				payload = fromOperationProfileForm(values, { validateJson: true });
 			} catch (error) {
 				setJsonError(error instanceof Error ? error.message : String(error));
-				return;
+				throw error;
 			}
 
+			const updatedBlock = await doUpdate({
+				blockId: block.blockId,
+				patch: {
+					name: payload.name,
+					description: payload.description,
+					enabled: payload.enabled,
+					operations: payload.operations,
+					...(typeof meta === 'undefined' ? {} : { meta }),
+				},
+			});
+			const nextValues = toOperationBlockFormValues(updatedBlock);
+			reset(nextValues);
+			setBaselineValues(nextValues);
+			setEditingOpId((prev) => resolveEditingOperationId(prev, nextValues.operations));
+		},
+		[doUpdate, block.blockId, reset],
+	);
+
+	const submitValues = useCallback(
+		async (values: OperationProfileFormValues) => {
 			try {
-				const updatedBlock = await doUpdate({
-					blockId: block.blockId,
-					patch: {
-						name: payload.name,
-						description: payload.description,
-						enabled: payload.enabled,
-						operations: payload.operations,
-					},
-				});
-				const nextValues = toFormValuesFromBlock(updatedBlock);
-				reset(nextValues);
-				setBaselineValues(nextValues);
-				setEditingOpId((prev) => resolveEditingOperationId(prev, nextValues.operations));
+				await saveBlockDraft(values);
 			} catch {
 				// API errors are surfaced by model-level toasts.
 			}
 		},
-		[doUpdate, block.blockId, reset],
+		[saveBlockDraft],
 	);
 
 	const onSave = useMemo(() => methods.handleSubmit(submitValues), [methods, submitValues]);
@@ -382,6 +382,15 @@ export const OperationBlockEditor: React.FC<Props> = ({ block, preferSplitLayout
 					</>
 				)}
 			</Stack>
+
+			<OperationBlockNodeEditorModal
+				opened={nodeEditorOpened}
+				onClose={onNodeEditorClose ?? (() => undefined)}
+				block={block}
+				form={methods}
+				initialValues={initial}
+				onSaveDraft={saveBlockDraft}
+			/>
 		</FormProvider>
 	);
 };
diff --git a/web/src/i18n/resources/en/operationProfiles.ts b/web/src/i18n/resources/en/operationProfiles.ts
index 789040f8..1e72bb33 100644
--- a/web/src/i18n/resources/en/operationProfiles.ts
+++ b/web/src/i18n/resources/en/operationProfiles.ts
@@ -80,6 +80,38 @@ const enOperationProfiles = {
 				title: 'Operation',
 				unsaved: 'Unsaved',
 			},
+			validation: {
+				operation: 'Operation #{{number}}',
+				required: 'required',
+				fields: {
+					activation: 'activation',
+					dependsOn: 'dependencies',
+					hooks: 'hooks',
+					name: 'name',
+					order: 'order',
+					required: 'required flag',
+					runConditions: 'run conditions',
+					triggers: 'triggers',
+					credentialRef: 'LLM token',
+					model: 'model',
+					prompt: 'prompt',
+					system: 'system prompt',
+					jsonSchema: 'JSON schema',
+					jsonCustomPattern: 'JSON regex pattern',
+					jsonCustomFlags: 'JSON regex flags',
+					artifactId: 'artifact id',
+					artifactDescription: 'artifact description',
+					artifactExposures: 'artifact exposures',
+					artifactFormat: 'artifact format',
+					artifactHistoryEnabled: 'artifact history enabled',
+					artifactHistoryMaxItems: 'artifact history limit',
+					artifactPersistence: 'artifact persistence',
+					artifactSemantics: 'artifact semantics',
+					artifactTag: 'artifact tag',
+					artifactTitle: 'artifact title',
+					artifactWriteMode: 'artifact write mode',
+				},
+			},
 			llmRuntime: {
 				preset: 'LLM preset',
 				presetInfo: 'Preset selection copies provider, token, and model into this operation.',
diff --git a/web/src/i18n/resources/ru/operationProfiles.ts b/web/src/i18n/resources/ru/operationProfiles.ts
index 1a2fdb6f..eff8c41b 100644
--- a/web/src/i18n/resources/ru/operationProfiles.ts
+++ b/web/src/i18n/resources/ru/operationProfiles.ts
@@ -80,6 +80,38 @@ const ruOperationProfiles = {
 				title: 'Операция',
 				unsaved: 'Не сохранено',
 			},
+			validation: {
+				operation: 'Операция #{{number}}',
+				required: 'обязательное поле',
+				fields: {
+					activation: 'активация',
+					dependsOn: 'зависимости',
+					hooks: 'хуки',
+					name: 'имя',
+					order: 'порядок',
+					required: 'флаг обязательности',
+					runConditions: 'условия запуска',
+					triggers: 'триггеры',
+					credentialRef: 'LLM токен',
+					model: 'модель',
+					prompt: 'промпт',
+					system: 'system prompt',
+					jsonSchema: 'JSON-схема',
+					jsonCustomPattern: 'regex для JSON',
+					jsonCustomFlags: 'флаги regex для JSON',
+					artifactId: 'id артефакта',
+					artifactDescription: 'описание артефакта',
+					artifactExposures: 'экспозиции артефакта',
+					artifactFormat: 'формат артефакта',
+					artifactHistoryEnabled: 'история артефакта включена',
+					artifactHistoryMaxItems: 'лимит истории артефакта',
+					artifactPersistence: 'хранение артефакта',
+					artifactSemantics: 'семантика артефакта',
+					artifactTag: 'тег артефакта',
+					artifactTitle: 'заголовок артефакта',
+					artifactWriteMode: 'режим записи артефакта',
+				},
+			},
 			llmRuntime: {
 				preset: 'LLM пресет',
 				presetInfo: 'Пресет копирует провайдер, токен и модель в эту операцию.',

From b9e938a4058b438238fe2d834b0fbeb960ddde7a Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Mon, 20 Apr 2026 23:05:40 +0300
Subject: [PATCH 42/54] fix: share operation field array between block and node
 editors

---
 .../node-editor/block-node-editor-modal.tsx   | 18 ++++++++++++---
 .../operation-block-editor.tsx                | 22 +++++++++++++------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
index 762c3c18..1a35da64 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
@@ -12,7 +12,14 @@ import {
 	useNodesState,
 } from '@xyflow/react';
 import React, { useCallback, useDeferredValue, useEffect, useMemo, useRef, useState } from 'react';
-import { FormProvider, useFieldArray, useWatch, type UseFormReturn } from 'react-hook-form';
+import {
+	type FieldArrayWithId,
+	FormProvider,
+	useWatch,
+	type UseFieldArrayAppend,
+	type UseFieldArrayReplace,
+	type UseFormReturn,
+} from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -48,6 +55,11 @@ type Props = {
 	onClose: () => void;
 	block: OperationBlockDto;
 	form: UseFormReturn<OperationProfileFormValues>;
+	operationsFieldArray: {
+		fields: Array<FieldArrayWithId<OperationProfileFormValues, 'operations', '_key'>>;
+		append: UseFieldArrayAppend<OperationProfileFormValues, 'operations'>;
+		replace: UseFieldArrayReplace<OperationProfileFormValues, 'operations'>;
+	};
 	initialValues: OperationProfileFormValues;
 	onSaveDraft: (values: OperationProfileFormValues, meta?: unknown) => Promise<void>;
 };
@@ -78,6 +90,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 	onClose,
 	block,
 	form: methods,
+	operationsFieldArray,
 	initialValues,
 	onSaveDraft,
 }) => {
@@ -85,8 +98,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 	const isCompactLayout = useMediaQuery('(max-width: 1024px)');
 
 	const { control, reset: resetForm } = methods;
-
-	const { fields, append, replace } = useFieldArray({ name: 'operations', control, keyName: '_key' });
+	const { fields, append, replace } = operationsFieldArray;
 
 	const [selectedOpId, setSelectedOpId] = useState<string | null>(null);
 	const [selectedNodeIds, setSelectedNodeIds] = useState<string[]>([]);
diff --git a/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx b/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
index 7a386b4e..57fe8d41 100644
--- a/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
+++ b/web/src/features/sidebars/operation-profiles/operation-block-editor.tsx
@@ -124,26 +124,33 @@ export const OperationBlockEditor: React.FC<Props> = ({
 	const methods = useForm<OperationProfileFormValues>({ defaultValues: initial });
 	const { control, reset } = methods;
 	const watchedValues = useWatch({ control });
+	const watchedOperations = useWatch({ control, name: 'operations' });
 
-	const { fields, append, remove } = useFieldArray({
+	const operationsFieldArray = useFieldArray({
 		name: 'operations',
 		control,
 		keyName: '_key',
 	});
+	const { fields, append, remove } = operationsFieldArray;
 
 	const rows = useMemo<OperationListRowMeta[]>(() => {
-		return fields
-			.map((field, index): OperationListRowMeta | null => {
-				if (typeof field.opId !== 'string' || field.opId.length === 0) return null;
-				const rowKey = typeof field._key === 'string' && field._key.length > 0 ? field._key : `${field.opId}-${index}`;
+		const operations = Array.isArray(watchedOperations) ? watchedOperations : fields;
+		return operations
+			.map((operation, index): OperationListRowMeta | null => {
+				if (typeof operation?.opId !== 'string' || operation.opId.length === 0) return null;
+				const field = fields[index];
+				const rowKey =
+					typeof field?._key === 'string' && field._key.length > 0
+						? field._key
+						: `${operation.opId}-${index}`;
 				return {
-					opId: field.opId,
+					opId: operation.opId,
 					index,
 					rowKey,
 				};
 			})
 			.filter((row): row is OperationListRowMeta => row !== null);
-	}, [fields]);
+	}, [fields, watchedOperations]);
 
 	const [isProfileOpen, setIsProfileOpen] = useState(true);
 	const [jsonError, setJsonError] = useState<string | null>(null);
@@ -388,6 +395,7 @@ export const OperationBlockEditor: React.FC<Props> = ({
 				onClose={onNodeEditorClose ?? (() => undefined)}
 				block={block}
 				form={methods}
+				operationsFieldArray={operationsFieldArray}
 				initialValues={initial}
 				onSaveDraft={saveBlockDraft}
 			/>

From 3e78a7b52021a0f15e43b7f2bdf70836f4a3f10b Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Mon, 20 Apr 2026 23:18:24 +0300
Subject: [PATCH 43/54] Add node editor context menu and edge insertion

---
 .../node-editor/block-node-editor-modal.tsx   | 203 +++++++++++++++++-
 .../node-editor/node-editor-modal.css         |   8 +
 .../node-editor/operation-graph.test.ts       |  46 ++++
 .../node-editor/operation-graph.ts            | 104 ++++++---
 .../ui/node-editor-form-header.tsx            |   3 +
 .../ui/node-editor-graph-panel.tsx            |  11 +
 .../node-editor/ui/node-editor-header.tsx     |  13 +-
 .../i18n/resources/en/operationProfiles.ts    |  18 ++
 .../i18n/resources/ru/operationProfiles.ts    |  18 ++
 9 files changed, 379 insertions(+), 45 deletions(-)

diff --git a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
index 1a35da64..4854fe69 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
@@ -1,10 +1,11 @@
 import '@xyflow/react/dist/style.css';
 import './node-editor-modal.css';
 
-import { Alert, Divider, Group, Modal, SegmentedControl, Stack } from '@mantine/core';
+import { Alert, Button, Divider, Group, Kbd, List, Modal, Paper, SegmentedControl, Stack, Text } from '@mantine/core';
 import { useMediaQuery } from '@mantine/hooks';
 import {
 	type EdgeChange,
+	type Edge,
 	type Node,
 	type NodeChange,
 	type Connection,
@@ -35,6 +36,7 @@ import {
 	applyConnectionToOperations,
 	buildOperationGraphEdges,
 	connectSourceToOperation,
+	insertOperationBetweenEdge,
 	removeEdgeFromOperations,
 	removeOperationReferences,
 } from './operation-graph';
@@ -66,6 +68,11 @@ type Props = {
 
 type OpEdge = { source: string; target: string };
 type PendingConnection = { sourceId: string; sourceHandle: string | null };
+type FlowPosition = { x: number; y: number };
+type NodeEditorContextMenu =
+	| { type: 'pane'; x: number; y: number; position: FlowPosition }
+	| { type: 'node'; x: number; y: number; nodeId: string }
+	| { type: 'edge'; x: number; y: number; edgeId: string };
 
 const GROUP_BG_ALPHA = 0.08;
 
@@ -108,6 +115,8 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 	const [isLayoutDirty, setIsLayoutDirty] = useState(false);
 	const [flow, setFlow] = useState<ReactFlowInstance | null>(null);
 	const [groupEditor, setGroupEditor] = useState<GroupEditorDraft | null>(null);
+	const [contextMenu, setContextMenu] = useState<NodeEditorContextMenu | null>(null);
+	const [isHelpOpen, setIsHelpOpen] = useState(false);
 	const [viewState, setViewState] = useState<NodeEditorViewState>('graph');
 	const [isInspectorVisible, setIsInspectorVisible] = useState(true);
 
@@ -127,6 +136,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 		setGroups(metaGroups);
 		setSelectedGroupId(null);
 		setGroupEditor(null);
+		setContextMenu(null);
 		setIsLayoutDirty(false);
 		setViewState('graph');
 		setIsInspectorVisible(true);
@@ -189,6 +199,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 		setGroups(readNodeEditorMeta(block.meta)?.groups ?? {});
 		setSelectedGroupId(null);
 		setGroupEditor(null);
+		setContextMenu(null);
 		setIsLayoutDirty(false);
 		setViewState('graph');
 		setIsInspectorVisible(true);
@@ -299,23 +310,27 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 		}
 	});
 
-	const addOperation = useCallback(() => {
+	const closeContextMenu = useCallback(() => {
+		setContextMenu(null);
+	}, []);
+
+	const addOperationAt = useCallback((position?: FlowPosition) => {
 		const next = makeDefaultOperation();
 		append(next);
 
-		let position = { x: 0, y: fields.length * 160 };
-		if (flow && flowWrapperRef.current) {
+		let nextPosition = position ?? { x: 0, y: fields.length * 160 };
+		if (!position && flow && flowWrapperRef.current) {
 			const r = flowWrapperRef.current.getBoundingClientRect();
 			const center = { x: r.left + r.width / 2, y: r.top + r.height / 2 };
 			const p = (flow as any).screenToFlowPosition ? (flow as any).screenToFlowPosition(center) : null;
-			if (p && typeof p.x === 'number' && typeof p.y === 'number') position = { x: p.x, y: p.y };
+			if (p && typeof p.x === 'number' && typeof p.y === 'number') nextPosition = { x: p.x, y: p.y };
 		}
 		setNodes((prev) => [
 			...prev,
 			{
 				id: next.opId,
 				type: 'operation',
-				position,
+				position: nextPosition,
 				zIndex: Z_INDEX.flow.node,
 				data: buildOperationFlowNodeData(next),
 			},
@@ -326,6 +341,16 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 		else setIsInspectorVisible(true);
 	}, [append, fields.length, flow, isCompactLayout, setNodes]);
 
+	const addOperation = useCallback(() => {
+		addOperationAt();
+	}, [addOperationAt]);
+
+	const createOperationFromContext = useCallback(() => {
+		if (contextMenu?.type !== 'pane') return;
+		addOperationAt(contextMenu.position);
+		closeContextMenu();
+	}, [addOperationAt, closeContextMenu, contextMenu]);
+
 	const deleteSelectedNodes = useCallback(() => {
 		const ids = selectedNodeIds.length ? selectedNodeIds : selectedOpId ? [selectedOpId] : [];
 		if (ids.length === 0) return;
@@ -345,7 +370,19 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 
 		setSelectedNodeIds((prev) => prev.filter((id) => !ids.includes(id)));
 		setSelectedOpId((prev) => (prev && ids.includes(prev) ? null : prev));
-	}, [methods, replace, selectedNodeIds, selectedOpId, setNodes]);
+		closeContextMenu();
+	}, [closeContextMenu, methods, replace, selectedNodeIds, selectedOpId, setNodes]);
+
+	const deleteNodeById = useCallback((nodeId: string) => {
+		const current = methods.getValues();
+		const nextOps = removeOperationReferences(current.operations, nodeId).filter((op) => op.opId !== nodeId);
+		replace(nextOps);
+		setNodes((prev) => prev.filter((n) => String(n.id) !== nodeId));
+		setIsLayoutDirty(true);
+		setSelectedNodeIds((prev) => prev.filter((id) => id !== nodeId));
+		setSelectedOpId((prev) => (prev === nodeId ? null : prev));
+		closeContextMenu();
+	}, [closeContextMenu, methods, replace, setNodes]);
 
 	// Keyboard delete (Delete / Backspace) — but do not interfere with typing in inputs.
 	useEffect(() => {
@@ -396,6 +433,85 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 		return out;
 	}, [nodes]);
 
+	const openPaneContextMenu = useCallback((event: React.MouseEvent | MouseEvent) => {
+		event.preventDefault();
+		const client = { x: event.clientX, y: event.clientY };
+		const position =
+			flow && (flow as any).screenToFlowPosition
+				? (flow as any).screenToFlowPosition(client)
+				: { x: 0, y: 0 };
+		setContextMenu({
+			type: 'pane',
+			x: client.x,
+			y: client.y,
+			position: {
+				x: typeof position?.x === 'number' ? position.x : 0,
+				y: typeof position?.y === 'number' ? position.y : 0,
+			},
+		});
+	}, [flow]);
+
+	const openNodeContextMenu = useCallback((event: React.MouseEvent, node: Node) => {
+		event.preventDefault();
+		event.stopPropagation();
+		const nodeId = String(node.id);
+		setSelectedOpId(nodeId);
+		setContextMenu({ type: 'node', x: event.clientX, y: event.clientY, nodeId });
+	}, []);
+
+	const openEdgeContextMenu = useCallback((event: React.MouseEvent, edge: Edge) => {
+		event.preventDefault();
+		event.stopPropagation();
+		setContextMenu({ type: 'edge', x: event.clientX, y: event.clientY, edgeId: String(edge.id) });
+	}, []);
+
+	const deleteNodeFromContext = useCallback(() => {
+		if (contextMenu?.type !== 'node') return;
+		if (!window.confirm(t('operationProfiles.confirm.deleteOperation'))) return;
+		deleteNodeById(contextMenu.nodeId);
+	}, [contextMenu, deleteNodeById, t]);
+
+	const deleteEdgeFromContext = useCallback(() => {
+		if (contextMenu?.type !== 'edge') return;
+		replace(removeEdgeFromOperations(methods.getValues().operations, contextMenu.edgeId));
+		setIsLayoutDirty(true);
+		closeContextMenu();
+	}, [closeContextMenu, contextMenu, methods, replace]);
+
+	const insertOperationFromEdgeContext = useCallback(() => {
+		if (contextMenu?.type !== 'edge') return;
+		const edge = edges.find((item) => item.id === contextMenu.edgeId);
+		if (!edge) {
+			closeContextMenu();
+			return;
+		}
+
+		const sourceNode = nodesById.get(String(edge.source));
+		const targetNode = nodesById.get(String(edge.target));
+		const position = {
+			x: ((sourceNode?.position.x ?? 0) + (targetNode?.position.x ?? 0)) / 2,
+			y: ((sourceNode?.position.y ?? 0) + (targetNode?.position.y ?? 0)) / 2,
+		};
+		const next = makeDefaultOperation();
+		const nextOperations = insertOperationBetweenEdge(methods.getValues().operations, contextMenu.edgeId, next);
+		replace(nextOperations);
+		setNodes((prev) => [
+			...prev,
+			{
+				id: next.opId,
+				type: 'operation',
+				position,
+				zIndex: Z_INDEX.flow.node,
+				data: buildOperationFlowNodeData(next),
+			},
+		]);
+		setSelectedOpId(next.opId);
+		setIsLayoutDirty(true);
+		closeContextMenu();
+		if (isCompactLayout) setViewState('inspector');
+		else setIsInspectorVisible(true);
+	}, [closeContextMenu, contextMenu, edges, isCompactLayout, methods, nodesById, replace, setNodes]);
+
 	const computeGroupBounds = useCallback(
 		(nodeIds: string[]) => {
 			const live: Array<Node<OperationFlowNodeData>> = [];
@@ -582,10 +698,11 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 	);
 
 	const onPaneClick = useCallback(() => {
+		closeContextMenu();
 		setSelectedOpId(null);
 		setSelectedNodeIds((prev) => (prev.length === 0 ? prev : []));
 		if (isCompactLayout) setViewState('graph');
-	}, [isCompactLayout]);
+	}, [closeContextMenu, isCompactLayout]);
 
 	const onNodeDragStop = useCallback((_: unknown, node: Node) => {
 		setNodes((prev) => prev.map((n) => (String(n.id) === String(node.id) ? { ...n, position: node.position } : n)));
@@ -640,6 +757,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 						onAutoLayout={autoLayout}
 						onSave={onSave}
 						onClose={onClose}
+						onOpenHelp={() => setIsHelpOpen(true)}
 						isInspectorVisible={isInspectorVisible}
 						onToggleInspector={() => setIsInspectorVisible((prev) => !prev)}
 						showInspectorToggle={!isCompactLayout}
@@ -679,6 +797,9 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 								onNodeDragStop={onNodeDragStop}
 								onSelectionChange={onSelectionChange}
 								onNodeClick={onNodeClick}
+								onNodeContextMenu={openNodeContextMenu}
+								onEdgeContextMenu={openEdgeContextMenu}
+								onPaneContextMenu={openPaneContextMenu}
 								onPaneClick={onPaneClick}
 								groups={groups}
 								selectedGroupId={selectedGroupId}
@@ -715,6 +836,37 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 							</>
 						)}
 					</Group>
+
+					{contextMenu && (
+						<Paper
+							withBorder
+							shadow="md"
+							className="opNodeContextMenu"
+							style={{ left: contextMenu.x, top: contextMenu.y }}
+							onContextMenu={(event) => event.preventDefault()}
+						>
+							{contextMenu.type === 'pane' && (
+								<Button variant="subtle" size="xs" fullWidth justify="flex-start" onClick={createOperationFromContext}>
+									{t('operationProfiles.nodeEditor.context.createBlock')}
+								</Button>
+							)}
+							{contextMenu.type === 'node' && (
+								<Button color="red" variant="subtle" size="xs" fullWidth justify="flex-start" onClick={deleteNodeFromContext}>
+									{t('operationProfiles.nodeEditor.context.deleteBlock')}
+								</Button>
+							)}
+							{contextMenu.type === 'edge' && (
+								<Stack gap={2}>
+									<Button color="red" variant="subtle" size="xs" fullWidth justify="flex-start" onClick={deleteEdgeFromContext}>
+										{t('operationProfiles.nodeEditor.context.deleteEdge')}
+									</Button>
+									<Button variant="subtle" size="xs" fullWidth justify="flex-start" onClick={insertOperationFromEdgeContext}>
+										{t('operationProfiles.nodeEditor.context.insertBlock')}
+									</Button>
+								</Stack>
+							)}
+						</Paper>
+					)}
 				</Stack>
 
 				<GroupEditorModal
@@ -748,6 +900,41 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 						setGroupEditor(null);
 					}}
 				/>
+
+				<Modal
+					opened={isHelpOpen}
+					onClose={() => setIsHelpOpen(false)}
+					title={t('operationProfiles.nodeEditor.help.title')}
+					zIndex={Z_INDEX.overlay.modal + 1}
+					centered
+				>
+					<Stack gap="md">
+						<Stack gap="xs">
+							<Text fw={700}>{t('operationProfiles.nodeEditor.help.hotkeysTitle')}</Text>
+							<List spacing="xs" size="sm">
+								<List.Item>
+									<Kbd>Shift</Kbd> {t('operationProfiles.nodeEditor.help.selectionDrag')}
+								</List.Item>
+								<List.Item>
+									<Kbd>Ctrl</Kbd> / <Kbd>Cmd</Kbd> / <Kbd>Shift</Kbd>{' '}
+									{t('operationProfiles.nodeEditor.help.multiSelect')}
+								</List.Item>
+								<List.Item>
+									<Kbd>Delete</Kbd> / <Kbd>Backspace</Kbd> {t('operationProfiles.nodeEditor.help.deleteSelected')}
+								</List.Item>
+							</List>
+						</Stack>
+
+						<Stack gap="xs">
+							<Text fw={700}>{t('operationProfiles.nodeEditor.help.contextTitle')}</Text>
+							<List spacing="xs" size="sm">
+								<List.Item>{t('operationProfiles.nodeEditor.help.contextPane')}</List.Item>
+								<List.Item>{t('operationProfiles.nodeEditor.help.contextNode')}</List.Item>
+								<List.Item>{t('operationProfiles.nodeEditor.help.contextEdge')}</List.Item>
+							</List>
+						</Stack>
+					</Stack>
+				</Modal>
 			</FormProvider>
 		</Modal>
 	);
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/node-editor-modal.css b/web/src/features/sidebars/operation-profiles/node-editor/node-editor-modal.css
index db3a7757..003c5642 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/node-editor-modal.css
+++ b/web/src/features/sidebars/operation-profiles/node-editor/node-editor-modal.css
@@ -38,6 +38,14 @@
 	box-shadow: var(--op-node-shadow);
 }
 
+.opNodeContextMenu {
+	position: fixed;
+	z-index: 20;
+	min-width: 190px;
+	padding: 4px;
+	background: var(--op-node-surface);
+}
+
 .opNodeInspector {
 	display: flex;
 	flex-direction: column;
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts
index f30f4743..75633a7f 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts
+++ b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.test.ts
@@ -6,6 +6,7 @@ import {
 	applyConnectionToOperations,
 	buildOperationGraphEdges,
 	buildGuardSourceHandleId,
+	insertOperationBetweenEdge,
 	removeEdgeFromOperations,
 } from './operation-graph';
 
@@ -137,4 +138,49 @@ describe('operation graph helpers', () => {
 		expect(next[1]?.config.runConditions).toEqual([]);
 		expect(next[1]?.config.dependsOn).toEqual([]);
 	});
+
+	it('inserts a new operation between dependency edge endpoints', () => {
+		const source = { ...makeTemplateOperation(), opId: 'source-1', name: 'Source' };
+		const target = {
+			...makeTemplateOperation(),
+			opId: 'target-1',
+			name: 'Target',
+			config: {
+				...makeTemplateOperation().config,
+				dependsOn: ['source-1'],
+			},
+		};
+		const middle = { ...makeTemplateOperation(), opId: 'middle-1', name: 'Middle' };
+
+		const next = insertOperationBetweenEdge([source, target], 'dep:source-1=>target-1', middle);
+
+		expect(next.map((op) => op.opId)).toEqual(['source-1', 'middle-1', 'target-1']);
+		expect(next[1]?.config.dependsOn).toEqual(['source-1']);
+		expect(next[2]?.config.dependsOn).toEqual(['middle-1']);
+	});
+
+	it('inserts a new operation between guard edge endpoints', () => {
+		const guard = makeGuardOperation();
+		const consumer = applyConnectionToOperations([guard, makeTemplateOperation()], {
+			source: 'guard-1',
+			sourceHandle: buildGuardSourceHandleId('isBattle'),
+			target: 'template-1',
+		})[1]!;
+		const middle = { ...makeTemplateOperation(), opId: 'middle-1', name: 'Middle' };
+
+		const next = insertOperationBetweenEdge([guard, consumer], 'guard:guard-1:isBattle:is_true=>template-1', middle);
+
+		expect(next.map((op) => op.opId)).toEqual(['guard-1', 'middle-1', 'template-1']);
+		expect(next[1]?.config.dependsOn).toEqual(['guard-1']);
+		expect(next[1]?.config.runConditions).toEqual([
+			{
+				type: 'guard_output',
+				sourceOpId: 'guard-1',
+				outputKey: 'isBattle',
+				operator: 'is_true',
+			},
+		]);
+		expect(next[2]?.config.dependsOn).toEqual(['middle-1']);
+		expect(next[2]?.config.runConditions).toEqual([]);
+	});
 });
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts
index 90d37a81..bb916e74 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts
+++ b/web/src/features/sidebars/operation-profiles/node-editor/operation-graph.ts
@@ -126,6 +126,42 @@ function applyConnectionToOperation(operation: FormOperation, connection: Pick<C
 	};
 }
 
+function withoutEdgeTargetReference(operation: FormOperation, edge: NonNullable<ReturnType<typeof parseEdgeId>>): FormOperation {
+	if (operation.opId !== edge.target) return operation;
+
+	if (edge.kind === 'dependency') {
+		return {
+			...operation,
+			config: {
+				...operation.config,
+				dependsOn: operation.config.dependsOn.filter((value) => value !== edge.source),
+			},
+		};
+	}
+
+	const nextConditions = normalizeRunConditions(operation.config.runConditions).filter(
+		(condition) =>
+			!(
+				condition.type === 'guard_output' &&
+				condition.sourceOpId === edge.source &&
+				condition.outputKey === edge.outputKey &&
+				condition.operator === edge.operator
+			),
+	);
+	const hasConditionsFromSameSource = nextConditions.some((condition) => condition.sourceOpId === edge.source);
+
+	return {
+		...operation,
+		config: {
+			...operation.config,
+			runConditions: nextConditions,
+			dependsOn: hasConditionsFromSameSource
+				? operation.config.dependsOn
+				: operation.config.dependsOn.filter((value) => value !== edge.source),
+		},
+	};
+}
+
 export function applyConnectionToOperations(
 	operations: FormOperation[],
 	connection: Pick<Connection, 'source' | 'sourceHandle' | 'target'>,
@@ -147,6 +183,38 @@ export function connectSourceToOperation(
 	});
 }
 
+export function insertOperationBetweenEdge(operations: FormOperation[], edgeId: string, operation: FormOperation): FormOperation[] {
+	const edge = parseEdgeId(edgeId);
+	if (!edge) return operations;
+	if (operation.opId === edge.source || operation.opId === edge.target) return operations;
+
+	const targetIndex = operations.findIndex((item) => item.opId === edge.target);
+	if (targetIndex < 0 || !operations.some((item) => item.opId === edge.source)) return operations;
+
+	const sourceHandle = edge.kind === 'guard_output' ? buildGuardSourceHandleId(edge.outputKey) : DEFAULT_SOURCE_HANDLE_ID;
+	const connectedOperation = connectSourceToOperation(operation, {
+		source: edge.source,
+		sourceHandle,
+	});
+	const rewiredOperations = operations.map((item) => {
+		const withoutOriginalEdge = withoutEdgeTargetReference(item, edge);
+		if (withoutOriginalEdge.opId !== edge.target) return withoutOriginalEdge;
+		return {
+			...withoutOriginalEdge,
+			config: {
+				...withoutOriginalEdge.config,
+				dependsOn: withUnique([...(withoutOriginalEdge.config.dependsOn ?? []), connectedOperation.opId]),
+			},
+		};
+	});
+
+	return [
+		...rewiredOperations.slice(0, targetIndex),
+		connectedOperation,
+		...rewiredOperations.slice(targetIndex),
+	];
+}
+
 export function buildOperationGraphEdges(operations: OperationGraphSource[]): Edge<OperationGraphEdgeData>[] {
 	const edges: Edge<OperationGraphEdgeData>[] = [];
 	for (const operation of operations) {
@@ -191,41 +259,7 @@ export function removeEdgeFromOperations(operations: FormOperation[], edgeId: st
 	const edge = parseEdgeId(edgeId);
 	if (!edge) return operations;
 
-	return operations.map((operation) => {
-		if (operation.opId !== edge.target) return operation;
-
-		if (edge.kind === 'dependency') {
-			return {
-				...operation,
-				config: {
-					...operation.config,
-					dependsOn: operation.config.dependsOn.filter((value) => value !== edge.source),
-				},
-			};
-		}
-
-		const nextConditions = normalizeRunConditions(operation.config.runConditions).filter(
-			(condition) =>
-				!(
-					condition.type === 'guard_output' &&
-					condition.sourceOpId === edge.source &&
-					condition.outputKey === edge.outputKey &&
-					condition.operator === edge.operator
-				),
-		);
-		const hasConditionsFromSameSource = nextConditions.some((condition) => condition.sourceOpId === edge.source);
-
-		return {
-			...operation,
-			config: {
-				...operation.config,
-				runConditions: nextConditions,
-				dependsOn: hasConditionsFromSameSource
-					? operation.config.dependsOn
-					: operation.config.dependsOn.filter((value) => value !== edge.source),
-			},
-		};
-	});
+	return operations.map((operation) => withoutEdgeTargetReference(operation, edge));
 }
 
 export function removeOperationReferences(operations: FormOperation[], removedOpId: string): FormOperation[] {
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx
index eb8729b3..573d329e 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx
@@ -11,6 +11,7 @@ type Props = {
 	onAutoLayout: () => void;
 	onSave: () => void;
 	onClose: () => void;
+	onOpenHelp: () => void;
 	isInspectorVisible?: boolean;
 	onToggleInspector?: () => void;
 	showInspectorToggle?: boolean;
@@ -22,6 +23,7 @@ export const NodeEditorFormHeader: React.FC<Props> = ({
 	onAutoLayout,
 	onSave,
 	onClose,
+	onOpenHelp,
 	isInspectorVisible,
 	onToggleInspector,
 	showInspectorToggle,
@@ -36,6 +38,7 @@ export const NodeEditorFormHeader: React.FC<Props> = ({
 			onAutoLayout={onAutoLayout}
 			onSave={onSave}
 			onClose={onClose}
+			onOpenHelp={onOpenHelp}
 			isInspectorVisible={isInspectorVisible}
 			onToggleInspector={onToggleInspector}
 			showInspectorToggle={showInspectorToggle}
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-graph-panel.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-graph-panel.tsx
index f369f51a..fab2f0d1 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-graph-panel.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-graph-panel.tsx
@@ -11,6 +11,7 @@ import {
 	Panel,
 	ReactFlow,
 	ReactFlowProvider,
+	SelectionMode,
 	type ReactFlowInstance,
 } from '@xyflow/react';
 import React, { memo } from 'react';
@@ -37,6 +38,9 @@ type Props = {
 	onNodeDragStop: (event: unknown, node: Node) => void;
 	onSelectionChange: (selection: { nodes: Array<{ id: string | number }> }) => void;
 	onNodeClick: (event: unknown, node: Node) => void;
+	onNodeContextMenu: (event: React.MouseEvent, node: Node) => void;
+	onEdgeContextMenu: (event: React.MouseEvent, edge: Edge) => void;
+	onPaneContextMenu: (event: React.MouseEvent | MouseEvent) => void;
 	onPaneClick: () => void;
 	groups: Record<string, EditorGroup>;
 	selectedGroupId: string | null;
@@ -71,6 +75,9 @@ export const NodeEditorGraphPanel: React.FC<Props> = memo(
 		onNodeDragStop,
 		onSelectionChange,
 		onNodeClick,
+		onNodeContextMenu,
+		onEdgeContextMenu,
+		onPaneContextMenu,
 		onPaneClick,
 		groups,
 		selectedGroupId,
@@ -106,11 +113,15 @@ export const NodeEditorGraphPanel: React.FC<Props> = memo(
 						onNodesChange={onNodesChange}
 						onNodeDragStop={onNodeDragStop}
 						selectionOnDrag
+						selectionMode={SelectionMode.Partial}
 						selectionKeyCode={['Shift']}
 						multiSelectionKeyCode={['Control', 'Meta', 'Shift']}
 						deleteKeyCode={null}
 						onSelectionChange={onSelectionChange as never}
 						onNodeClick={onNodeClick}
+						onNodeContextMenu={onNodeContextMenu}
+						onEdgeContextMenu={onEdgeContextMenu}
+						onPaneContextMenu={onPaneContextMenu}
 						onPaneClick={onPaneClick}
 					>
 						<Background />
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-header.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-header.tsx
index 4fef8a6c..46c9ad4f 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-header.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-header.tsx
@@ -1,7 +1,9 @@
-import { Badge, Button, Group, Stack, Text } from '@mantine/core';
+import { ActionIcon, Badge, Button, Group, Stack, Text, Tooltip } from '@mantine/core';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuLayoutDashboard, LuPanelRightClose, LuPanelRightOpen, LuSave, LuX } from 'react-icons/lu';
+import { LuInfo, LuLayoutDashboard, LuPanelRightClose, LuPanelRightOpen, LuSave, LuX } from 'react-icons/lu';
+
+import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
 
 type Props = {
 	profileName: string;
@@ -9,6 +11,7 @@ type Props = {
 	onAutoLayout: () => void;
 	onSave: () => void;
 	onClose: () => void;
+	onOpenHelp: () => void;
 	isInspectorVisible?: boolean;
 	onToggleInspector?: () => void;
 	showInspectorToggle?: boolean;
@@ -20,6 +23,7 @@ export const NodeEditorHeader: React.FC<Props> = ({
 	onAutoLayout,
 	onSave,
 	onClose,
+	onOpenHelp,
 	isInspectorVisible,
 	onToggleInspector,
 	showInspectorToggle = false,
@@ -41,6 +45,11 @@ export const NodeEditorHeader: React.FC<Props> = ({
 			</Stack>
 
 			<Group gap="xs" wrap="nowrap">
+				<Tooltip label={t('operationProfiles.nodeEditor.help.open')} {...TOOLTIP_PORTAL_SETTINGS}>
+					<ActionIcon variant="subtle" aria-label={t('operationProfiles.nodeEditor.help.open')} onClick={onOpenHelp}>
+						<LuInfo size={18} />
+					</ActionIcon>
+				</Tooltip>
 				{showInspectorToggle && (
 					<Button variant="default" leftSection={isInspectorVisible ? <LuPanelRightClose /> : <LuPanelRightOpen />} onClick={onToggleInspector}>
 						{isInspectorVisible ? t('operationProfiles.nodeEditor.hideOperation') : t('operationProfiles.nodeEditor.showOperation')}
diff --git a/web/src/i18n/resources/en/operationProfiles.ts b/web/src/i18n/resources/en/operationProfiles.ts
index 1e72bb33..cb1cb8ee 100644
--- a/web/src/i18n/resources/en/operationProfiles.ts
+++ b/web/src/i18n/resources/en/operationProfiles.ts
@@ -414,6 +414,24 @@ const enOperationProfiles = {
 				selectNode: 'Select a node to edit operation details.',
 				groupNamePrompt: 'Group name',
 				groupNameDefault: 'Group {{index}}',
+				context: {
+					createBlock: 'Create block',
+					deleteBlock: 'Delete block',
+					deleteEdge: 'Delete edge',
+					insertBlock: 'Insert block between nodes',
+				},
+				help: {
+					open: 'Node editor help',
+					title: 'Node editor controls',
+					hotkeysTitle: 'Hotkeys',
+					contextTitle: 'Context menu',
+					selectionDrag: 'drag on the canvas to select nodes. Partial overlap selects a node.',
+					multiSelect: 'click nodes to add or remove them from selection.',
+					deleteSelected: 'deletes selected nodes unless you are typing in a field.',
+					contextPane: 'Right-click empty canvas to create a block at that point.',
+					contextNode: 'Right-click a block to delete it.',
+					contextEdge: 'Right-click an edge to delete it or insert a new block between linked nodes.',
+				},
 			},
 			groupEditor: {
 				title: 'Edit group',
diff --git a/web/src/i18n/resources/ru/operationProfiles.ts b/web/src/i18n/resources/ru/operationProfiles.ts
index eff8c41b..c7556179 100644
--- a/web/src/i18n/resources/ru/operationProfiles.ts
+++ b/web/src/i18n/resources/ru/operationProfiles.ts
@@ -415,6 +415,24 @@ const ruOperationProfiles = {
 				selectNode: 'Выберите узел для редактирования деталей операции.',
 				groupNamePrompt: 'Имя группы',
 				groupNameDefault: 'Группа {{index}}',
+				context: {
+					createBlock: 'Создать блок',
+					deleteBlock: 'Удалить блок',
+					deleteEdge: 'Удалить связь',
+					insertBlock: 'Вставить блок между узлами',
+				},
+				help: {
+					open: 'Справка Node Editor',
+					title: 'Управление Node Editor',
+					hotkeysTitle: 'Хоткеи',
+					contextTitle: 'Контекстное меню',
+					selectionDrag: 'протяните по холсту, чтобы выделить узлы. Частичного пересечения достаточно.',
+					multiSelect: 'кликайте по узлам, чтобы добавить или убрать их из выделения.',
+					deleteSelected: 'удаляет выбранные узлы, если вы не печатаете в поле ввода.',
+					contextPane: 'Правый клик по пустому холсту создает блок в этой точке.',
+					contextNode: 'Правый клик по блоку позволяет удалить его.',
+					contextEdge: 'Правый клик по связи позволяет удалить ее или вставить новый блок между связанными узлами.',
+				},
 			},
 			groupEditor: {
 				title: 'Редактировать группу',

From 6f842d03e8b001eb9c65397087de3d92a758c73b Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Fri, 24 Apr 2026 17:21:17 +0300
Subject: [PATCH 44/54] Refactor Node Editor with ELK auto-layout and viewport
 persistence

---
 web/package.json                              |   1 +
 .../node-editor/block-node-editor-modal.tsx   | 823 +++---------------
 .../hooks/use-node-editor-actions.ts          | 373 ++++++++
 .../hooks/use-node-editor-flow-state.ts       | 167 ++++
 .../hooks/use-node-editor-groups.ts           | 212 +++++
 .../node-editor/meta/node-editor-meta.test.ts |  35 +
 .../ui/node-editor-context-menu.tsx           |  59 ++
 .../ui/node-editor-form-header.tsx            |   5 +-
 .../node-editor/ui/node-editor-header.tsx     |   6 +-
 .../node-editor/ui/node-editor-help-modal.tsx |  50 ++
 .../node-editor/utils/layout.test.ts          |  79 ++
 .../node-editor/utils/layout.ts               | 112 ++-
 .../node-editor/utils/node-state.test.ts      |  85 ++
 .../node-editor/utils/node-state.ts           |  73 ++
 web/yarn.lock                                 |   5 +
 15 files changed, 1379 insertions(+), 706 deletions(-)
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-actions.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-flow-state.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-groups.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/meta/node-editor-meta.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-context-menu.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-help-modal.tsx
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/utils/layout.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.ts

diff --git a/web/package.json b/web/package.json
index 7b777998..4b5daa10 100644
--- a/web/package.json
+++ b/web/package.json
@@ -43,6 +43,7 @@
     "dayjs": "^1.11.19",
     "effector": "^23.4.4",
     "effector-react": "^23.3.0",
+    "elkjs": "^0.11.1",
     "embla-carousel": "8.5.2",
     "embla-carousel-react": "8.5.2",
     "handlebars": "^4.7.8",
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
index 4854fe69..a0cf0842 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
@@ -1,18 +1,10 @@
 import '@xyflow/react/dist/style.css';
 import './node-editor-modal.css';
 
-import { Alert, Button, Divider, Group, Kbd, List, Modal, Paper, SegmentedControl, Stack, Text } from '@mantine/core';
+import { Alert, Divider, Group, Modal, SegmentedControl, Stack } from '@mantine/core';
 import { useMediaQuery } from '@mantine/hooks';
-import {
-	type EdgeChange,
-	type Edge,
-	type Node,
-	type NodeChange,
-	type Connection,
-	type ReactFlowInstance,
-	useNodesState,
-} from '@xyflow/react';
-import React, { useCallback, useDeferredValue, useEffect, useMemo, useRef, useState } from 'react';
+import { type Node } from '@xyflow/react';
+import React, { useCallback, useDeferredValue, useEffect, useMemo, useState } from 'react';
 import {
 	type FieldArrayWithId,
 	FormProvider,
@@ -22,33 +14,26 @@ import {
 	type UseFormReturn,
 } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { v4 as uuidv4 } from 'uuid';
 
 import { Z_INDEX } from '@ui/z-index';
 
-import { makeDefaultOperation, type OperationProfileFormValues } from '../form/operation-profile-form-mapping';
+import { type OperationProfileFormValues } from '../form/operation-profile-form-mapping';
 
 import { buildOperationFlowNodeData, buildOperationFlowNodeSignature } from './flow/operation-flow-node-model';
 import { buildGraphOperations, buildGraphWatchPaths } from './graph-form-state';
-import { useGroupLabelDrag } from './hooks/use-group-label-drag';
-import { computeSimpleLayout, readNodeEditorMeta, writeNodeEditorMeta } from './meta/node-editor-meta';
-import {
-	applyConnectionToOperations,
-	buildOperationGraphEdges,
-	connectSourceToOperation,
-	insertOperationBetweenEdge,
-	removeEdgeFromOperations,
-	removeOperationReferences,
-} from './operation-graph';
-import { GroupEditorModal, type GroupEditorDraft } from './ui/group-editor-modal';
+import { useNodeEditorActions } from './hooks/use-node-editor-actions';
+import { useNodeEditorFlowState } from './hooks/use-node-editor-flow-state';
+import { useNodeEditorGroups } from './hooks/use-node-editor-groups';
+import { readNodeEditorMeta, writeNodeEditorMeta } from './meta/node-editor-meta';
+import { buildOperationGraphEdges } from './operation-graph';
+import { GroupEditorModal } from './ui/group-editor-modal';
+import { NodeEditorContextMenu } from './ui/node-editor-context-menu';
 import { NodeEditorFormHeader } from './ui/node-editor-form-header';
 import { NodeEditorGraphPanel } from './ui/node-editor-graph-panel';
+import { NodeEditorHelpModal } from './ui/node-editor-help-modal';
 import { NodeEditorInspectorPanel } from './ui/node-editor-inspector-panel';
-import { computeBoundsFromNodes } from './utils/bounds';
-import { DEFAULT_GROUP_COLOR_HEX, normalizeCssColorToOpaqueRgbString } from './utils/color';
 
 import type { OperationFlowNodeData } from './flow/operation-flow-node';
-import type { EditorGroup } from './ui/group-overlays';
 import type { OperationBlockDto } from '../../../../api/chat-core';
 import type { NodeEditorViewState } from '../ui/types';
 
@@ -66,32 +51,12 @@ type Props = {
 	onSaveDraft: (values: OperationProfileFormValues, meta?: unknown) => Promise<void>;
 };
 
-type OpEdge = { source: string; target: string };
-type PendingConnection = { sourceId: string; sourceHandle: string | null };
-type FlowPosition = { x: number; y: number };
-type NodeEditorContextMenu =
-	| { type: 'pane'; x: number; y: number; position: FlowPosition }
-	| { type: 'node'; x: number; y: number; nodeId: string }
-	| { type: 'edge'; x: number; y: number; edgeId: string };
-
 const GROUP_BG_ALPHA = 0.08;
 
-function edgesToDeps(edges: Array<{ source: string; target: string }>): OpEdge[] {
-	return edges.map((e) => ({ source: e.source, target: e.target }));
-}
-
 function extractOpIds(values: OperationProfileFormValues): string[] {
 	return values.operations.map((o) => o.opId).filter(Boolean);
 }
 
-function isTextEditingTarget(target: EventTarget | null): boolean {
-	if (!target || !(target instanceof HTMLElement)) return false;
-	if (target.isContentEditable) return true;
-	const tag = target.tagName.toLowerCase();
-	if (tag === 'input' || tag === 'textarea' || tag === 'select') return true;
-	return Boolean(target.closest?.('[contenteditable="true"]'));
-}
-
 export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 	opened,
 	onClose,
@@ -107,63 +72,12 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 	const { control, reset: resetForm } = methods;
 	const { fields, append, replace } = operationsFieldArray;
 
-	const [selectedOpId, setSelectedOpId] = useState<string | null>(null);
-	const [selectedNodeIds, setSelectedNodeIds] = useState<string[]>([]);
-	const [groups, setGroups] = useState<Record<string, EditorGroup>>({});
-	const [selectedGroupId, setSelectedGroupId] = useState<string | null>(null);
 	const [jsonError, setJsonError] = useState<string | null>(null);
 	const [isLayoutDirty, setIsLayoutDirty] = useState(false);
-	const [flow, setFlow] = useState<ReactFlowInstance | null>(null);
-	const [groupEditor, setGroupEditor] = useState<GroupEditorDraft | null>(null);
-	const [contextMenu, setContextMenu] = useState<NodeEditorContextMenu | null>(null);
 	const [isHelpOpen, setIsHelpOpen] = useState(false);
 	const [viewState, setViewState] = useState<NodeEditorViewState>('graph');
 	const [isInspectorVisible, setIsInspectorVisible] = useState(true);
 
-	const connectingSourceRef = useRef<PendingConnection | null>(null);
-	const didConnectRef = useRef(false);
-	const prevNodeIdsKeyRef = useRef<string>('');
-	const flowWrapperRef = useRef<HTMLDivElement | null>(null);
-	const nodesRef = useRef<Array<Node<OperationFlowNodeData>>>([]);
-	const [nodes, setNodes, onNodesChangeBase] = useNodesState<Node<OperationFlowNodeData>>([]);
-
-	const resetToInitialState = useCallback(() => {
-		setJsonError(null);
-		resetForm(initialValues);
-		setSelectedOpId(null);
-		setSelectedNodeIds([]);
-		const metaGroups = readNodeEditorMeta(block.meta)?.groups ?? {};
-		setGroups(metaGroups);
-		setSelectedGroupId(null);
-		setGroupEditor(null);
-		setContextMenu(null);
-		setIsLayoutDirty(false);
-		setViewState('graph');
-		setIsInspectorVisible(true);
-
-		const meta = readNodeEditorMeta(block.meta);
-		const resetEdges = buildOperationGraphEdges(initialValues.operations);
-		const resetFallbackPositions = computeSimpleLayout(extractOpIds(initialValues), edgesToDeps(resetEdges));
-		const nextNodes: Array<Node<OperationFlowNodeData>> = initialValues.operations.map((op) => {
-			const pos = meta?.nodes?.[op.opId] ?? resetFallbackPositions[op.opId] ?? { x: 0, y: 0 };
-			return {
-				id: op.opId,
-				type: 'operation',
-				position: pos,
-				zIndex: Z_INDEX.flow.node,
-				data: buildOperationFlowNodeData(op),
-			};
-		});
-		setNodes(nextNodes);
-	}, [initialValues, block.meta, resetForm, setNodes]);
-
-	const areStringArraysEqual = useCallback((a: string[], b: string[]) => {
-		if (a === b) return true;
-		if (a.length !== b.length) return false;
-		for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
-		return true;
-	}, []);
-
 	const graphWatchPaths = useMemo(() => buildGraphWatchPaths(fields.length), [fields.length]);
 	const graphWatchValues = useWatch({ control, name: graphWatchPaths as any }) as unknown[] | undefined;
 	const graphOperations = useMemo(() => buildGraphOperations(fields, graphWatchValues), [fields, graphWatchValues]);
@@ -182,103 +96,112 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 	);
 	const opIndexById = useMemo(() => new Map(fields.map((field, idx) => [String(field.opId), idx])), [fields]);
 	const edges = useMemo(() => buildOperationGraphEdges(deferredGraphOperations), [deferredGraphOperations]);
-	const fallbackPositions = useMemo(
-		() => computeSimpleLayout(nodeDrafts.map((draft) => draft.opId), edgesToDeps(edges)),
-		[nodeDrafts, edges],
-	);
-	useEffect(() => {
-		nodesRef.current = nodes;
+	const {
+		flow,
+		setFlow,
+		flowWrapperRef,
+		nodes,
+		setNodes,
+		nodesRef,
+		onNodesChange,
+		resetNodesFromInitialValues,
+		runAutoLayout,
+		isAutoLayouting,
+	} = useNodeEditorFlowState({
+		opened,
+		blockId: block.blockId,
+		blockMeta: block.meta,
+		initialValues,
+		nodeDrafts,
+		edges,
+		onDirty: () => setIsLayoutDirty(true),
+	});
+	const nodesById = useMemo(() => {
+		const out = new Map<string, Node<OperationFlowNodeData>>();
+		for (const node of nodes) out.set(String(node.id), node);
+		return out;
 	}, [nodes]);
+	const {
+		groups,
+		resetGroups,
+		selectedGroupId,
+		setSelectedGroupId,
+		groupEditor,
+		setGroupEditor,
+		groupSelectData,
+		computeGroupBounds,
+		groupLabelDrag,
+		createGroupFromSelection,
+		ungroupSelectedAction,
+		deleteGroup,
+		saveGroup,
+	} = useNodeEditorGroups({
+		flow,
+		nodes,
+		nodesById,
+		nodesRef,
+		setNodes,
+		onDirty: () => setIsLayoutDirty(true),
+	});
+	const {
+		selectedOpId,
+		selectedNodeIds,
+		contextMenu,
+		resetActionState,
+		addOperation,
+		deleteSelectedAction,
+		openPaneContextMenu,
+		openNodeContextMenu,
+		openEdgeContextMenu,
+		createOperationFromContext,
+		deleteNodeFromContext,
+		deleteEdgeFromContext,
+		insertOperationFromEdgeContext,
+		onConnect,
+		onConnectStart,
+		onConnectEnd,
+		onEdgesChange,
+		onSelectionChange,
+		onNodeClick,
+		onPaneClick,
+		onNodeDragStop,
+	} = useNodeEditorActions({
+		opened,
+		isCompactLayout,
+		flow,
+		flowWrapperRef,
+		fieldsLength: fields.length,
+		append,
+		replace,
+		methods,
+		edges,
+		nodesById,
+		setNodes,
+		setViewState,
+		setIsInspectorVisible,
+		onDirty: () => setIsLayoutDirty(true),
+	});
 
-	// Initialize nodes on open / profile change.
 	useEffect(() => {
 		if (!opened) return;
 		setJsonError(null);
-		setSelectedOpId(null);
-		setSelectedNodeIds([]);
-		setGroups(readNodeEditorMeta(block.meta)?.groups ?? {});
-		setSelectedGroupId(null);
-		setGroupEditor(null);
-		setContextMenu(null);
+		resetActionState();
+		resetGroups(readNodeEditorMeta(block.meta)?.groups ?? {});
 		setIsLayoutDirty(false);
 		setViewState('graph');
 		setIsInspectorVisible(true);
+	}, [opened, block.blockId, block.meta, resetActionState, resetGroups]);
 
-		const meta = readNodeEditorMeta(block.meta);
-		const initialNodes: Array<Node<OperationFlowNodeData>> = nodeDrafts.map((draft) => {
-			const pos = meta?.nodes?.[draft.opId] ?? fallbackPositions[draft.opId] ?? { x: 0, y: 0 };
-			return {
-				id: draft.opId,
-				type: 'operation',
-				position: pos,
-				zIndex: Z_INDEX.flow.node,
-				data: draft.data,
-			};
-		});
-		setNodes(initialNodes);
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [opened, block.blockId]);
-
-	useEffect(() => {
-		if (!opened) return;
+	const resetToInitialState = useCallback(() => {
+		setJsonError(null);
+		resetForm(initialValues);
+		resetActionState();
+		resetGroups(readNodeEditorMeta(block.meta)?.groups ?? {});
+		setIsLayoutDirty(false);
+		setViewState('graph');
 		setIsInspectorVisible(true);
-	}, [opened, block.blockId]);
-
-	// Keep node data in sync with form, but preserve positions while dragging.
-	useEffect(() => {
-		if (!opened) return;
-		setNodes((prev) => {
-			const prevById = new Map(prev.map((n) => [String(n.id), n]));
-			const next = nodeDrafts.map((draft) => {
-				const existing = prevById.get(draft.opId);
-
-				// Important: preserve measured/width/height/etc that ReactFlow stores in node state.
-				// Otherwise ReactFlow will keep re-measuring and emitting node changes, which can cause
-				// mount-time update loops ("Maximum update depth exceeded").
-				return {
-					...(existing ?? {}),
-					id: draft.opId,
-					type: 'operation',
-					position: existing?.position ?? fallbackPositions[draft.opId] ?? { x: 0, y: 0 },
-					zIndex: existing?.zIndex ?? Z_INDEX.flow.node,
-					data: draft.data,
-				} satisfies Node<OperationFlowNodeData>;
-			});
-
-			// Avoid pointless state updates (helps prevent feedback loops).
-			if (prev.length === next.length) {
-				let same = true;
-				for (let i = 0; i < next.length; i++) {
-					const a = prev[i];
-					const b = next[i];
-					if (!a || !b) {
-						same = false;
-						break;
-					}
-					if (String(a.id) !== String(b.id)) {
-						same = false;
-						break;
-					}
-					if ((a.type ?? '') !== (b.type ?? '')) {
-						same = false;
-						break;
-					}
-					if ((a.position?.x ?? 0) !== (b.position?.x ?? 0) || (a.position?.y ?? 0) !== (b.position?.y ?? 0)) {
-						same = false;
-						break;
-					}
-					if (nodeDrafts[i]?.signature !== buildOperationFlowNodeSignature(a.data as OperationFlowNodeData)) {
-						same = false;
-						break;
-					}
-				}
-				if (same) return prev;
-			}
-
-			return next;
-		});
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [opened, nodeDrafts, fallbackPositions]);
+		resetNodesFromInitialValues();
+	}, [block.meta, initialValues, resetActionState, resetForm, resetGroups, resetNodesFromInitialValues]);
 
 	const selectedIndex = selectedOpId ? (opIndexById.get(selectedOpId) ?? null) : null;
 
@@ -302,6 +225,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 				version: 1 as const,
 				nodes: nodesMap,
 				groups: Object.keys(groupsToSave).length ? groupsToSave : undefined,
+				viewport: flow?.getViewport(),
 			};
 			await onSaveDraft(values, writeNodeEditorMeta(block.meta, nodeEditorMeta));
 			setIsLayoutDirty(false);
@@ -310,428 +234,9 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 		}
 	});
 
-	const closeContextMenu = useCallback(() => {
-		setContextMenu(null);
-	}, []);
-
-	const addOperationAt = useCallback((position?: FlowPosition) => {
-		const next = makeDefaultOperation();
-		append(next);
-
-		let nextPosition = position ?? { x: 0, y: fields.length * 160 };
-		if (!position && flow && flowWrapperRef.current) {
-			const r = flowWrapperRef.current.getBoundingClientRect();
-			const center = { x: r.left + r.width / 2, y: r.top + r.height / 2 };
-			const p = (flow as any).screenToFlowPosition ? (flow as any).screenToFlowPosition(center) : null;
-			if (p && typeof p.x === 'number' && typeof p.y === 'number') nextPosition = { x: p.x, y: p.y };
-		}
-		setNodes((prev) => [
-			...prev,
-			{
-				id: next.opId,
-				type: 'operation',
-				position: nextPosition,
-				zIndex: Z_INDEX.flow.node,
-				data: buildOperationFlowNodeData(next),
-			},
-		]);
-		setIsLayoutDirty(true);
-		setSelectedOpId(next.opId);
-		if (isCompactLayout) setViewState('inspector');
-		else setIsInspectorVisible(true);
-	}, [append, fields.length, flow, isCompactLayout, setNodes]);
-
-	const addOperation = useCallback(() => {
-		addOperationAt();
-	}, [addOperationAt]);
-
-	const createOperationFromContext = useCallback(() => {
-		if (contextMenu?.type !== 'pane') return;
-		addOperationAt(contextMenu.position);
-		closeContextMenu();
-	}, [addOperationAt, closeContextMenu, contextMenu]);
-
-	const deleteSelectedNodes = useCallback(() => {
-		const ids = selectedNodeIds.length ? selectedNodeIds : selectedOpId ? [selectedOpId] : [];
-		if (ids.length === 0) return;
-
-		let current = methods.getValues();
-		for (const removedOpId of ids) {
-			current = {
-				...current,
-				operations: removeOperationReferences(current.operations, removedOpId),
-			};
-		}
-		const nextOps = current.operations.filter((op) => !ids.includes(op.opId));
-		replace(nextOps);
-
-		setNodes((prev) => prev.filter((n) => !ids.includes(String(n.id))));
-		setIsLayoutDirty(true);
-
-		setSelectedNodeIds((prev) => prev.filter((id) => !ids.includes(id)));
-		setSelectedOpId((prev) => (prev && ids.includes(prev) ? null : prev));
-		closeContextMenu();
-	}, [closeContextMenu, methods, replace, selectedNodeIds, selectedOpId, setNodes]);
-
-	const deleteNodeById = useCallback((nodeId: string) => {
-		const current = methods.getValues();
-		const nextOps = removeOperationReferences(current.operations, nodeId).filter((op) => op.opId !== nodeId);
-		replace(nextOps);
-		setNodes((prev) => prev.filter((n) => String(n.id) !== nodeId));
-		setIsLayoutDirty(true);
-		setSelectedNodeIds((prev) => prev.filter((id) => id !== nodeId));
-		setSelectedOpId((prev) => (prev === nodeId ? null : prev));
-		closeContextMenu();
-	}, [closeContextMenu, methods, replace, setNodes]);
-
-	// Keyboard delete (Delete / Backspace) — but do not interfere with typing in inputs.
-	useEffect(() => {
-		if (!opened) return;
-		const onKeyDown = (e: KeyboardEvent) => {
-			if (e.defaultPrevented) return;
-			if (isTextEditingTarget(e.target)) return;
-			if (e.key !== 'Delete' && e.key !== 'Backspace') return;
-			deleteSelectedNodes();
-			e.preventDefault();
-		};
-		window.addEventListener('keydown', onKeyDown);
-		return () => window.removeEventListener('keydown', onKeyDown);
-	}, [opened, deleteSelectedNodes]);
-
-	const createGroupFromSelection = useCallback(() => {
-		const ids = [...new Set(selectedNodeIds)].filter(Boolean);
-		if (ids.length < 2) return;
-		const suggestedName = t('operationProfiles.nodeEditor.groupNameDefault', { index: Object.keys(groups).length + 1 });
-		const name = window.prompt(t('operationProfiles.nodeEditor.groupNamePrompt'), suggestedName);
-		if (!name || !name.trim()) return;
-		const groupId = uuidv4();
-		setGroups((prev) => ({ ...prev, [groupId]: { name: name.trim(), nodeIds: ids } }));
-		setSelectedGroupId(groupId);
-		setIsLayoutDirty(true);
-	}, [groups, selectedNodeIds, t]);
-
-	const ungroupSelected = useCallback(() => {
-		if (!selectedGroupId) return;
-		setGroups((prev) => {
-			if (!prev[selectedGroupId]) return prev;
-			const { [selectedGroupId]: _removed, ...rest } = prev;
-			return rest;
-		});
-		setSelectedGroupId(null);
-		setGroupEditor((prev) => (prev?.groupId === selectedGroupId ? null : prev));
-		setIsLayoutDirty(true);
-	}, [selectedGroupId]);
-
-	const groupSelectData = useMemo(
-		() => Object.entries(groups).map(([value, g]) => ({ value, label: g.name })),
-		[groups],
-	);
-
-	const nodesById = useMemo(() => {
-		const out = new Map<string, Node<OperationFlowNodeData>>();
-		for (const node of nodes) out.set(String(node.id), node);
-		return out;
-	}, [nodes]);
-
-	const openPaneContextMenu = useCallback((event: React.MouseEvent | MouseEvent) => {
-		event.preventDefault();
-		const client = { x: event.clientX, y: event.clientY };
-		const position =
-			flow && (flow as any).screenToFlowPosition
-				? (flow as any).screenToFlowPosition(client)
-				: { x: 0, y: 0 };
-		setContextMenu({
-			type: 'pane',
-			x: client.x,
-			y: client.y,
-			position: {
-				x: typeof position?.x === 'number' ? position.x : 0,
-				y: typeof position?.y === 'number' ? position.y : 0,
-			},
-		});
-	}, [flow]);
-
-	const openNodeContextMenu = useCallback((event: React.MouseEvent, node: Node) => {
-		event.preventDefault();
-		event.stopPropagation();
-		const nodeId = String(node.id);
-		setSelectedOpId(nodeId);
-		setContextMenu({ type: 'node', x: event.clientX, y: event.clientY, nodeId });
-	}, []);
-
-	const openEdgeContextMenu = useCallback((event: React.MouseEvent, edge: Edge) => {
-		event.preventDefault();
-		event.stopPropagation();
-		setContextMenu({ type: 'edge', x: event.clientX, y: event.clientY, edgeId: String(edge.id) });
-	}, []);
-
-	const deleteNodeFromContext = useCallback(() => {
-		if (contextMenu?.type !== 'node') return;
-		if (!window.confirm(t('operationProfiles.confirm.deleteOperation'))) return;
-		deleteNodeById(contextMenu.nodeId);
-	}, [contextMenu, deleteNodeById, t]);
-
-	const deleteEdgeFromContext = useCallback(() => {
-		if (contextMenu?.type !== 'edge') return;
-		replace(removeEdgeFromOperations(methods.getValues().operations, contextMenu.edgeId));
-		setIsLayoutDirty(true);
-		closeContextMenu();
-	}, [closeContextMenu, contextMenu, methods, replace]);
-
-	const insertOperationFromEdgeContext = useCallback(() => {
-		if (contextMenu?.type !== 'edge') return;
-		const edge = edges.find((item) => item.id === contextMenu.edgeId);
-		if (!edge) {
-			closeContextMenu();
-			return;
-		}
-
-		const sourceNode = nodesById.get(String(edge.source));
-		const targetNode = nodesById.get(String(edge.target));
-		const position = {
-			x: ((sourceNode?.position.x ?? 0) + (targetNode?.position.x ?? 0)) / 2,
-			y: ((sourceNode?.position.y ?? 0) + (targetNode?.position.y ?? 0)) / 2,
-		};
-		const next = makeDefaultOperation();
-		const nextOperations = insertOperationBetweenEdge(methods.getValues().operations, contextMenu.edgeId, next);
-		replace(nextOperations);
-		setNodes((prev) => [
-			...prev,
-			{
-				id: next.opId,
-				type: 'operation',
-				position,
-				zIndex: Z_INDEX.flow.node,
-				data: buildOperationFlowNodeData(next),
-			},
-		]);
-		setSelectedOpId(next.opId);
-		setIsLayoutDirty(true);
-		closeContextMenu();
-		if (isCompactLayout) setViewState('inspector');
-		else setIsInspectorVisible(true);
-	}, [closeContextMenu, contextMenu, edges, isCompactLayout, methods, nodesById, replace, setNodes]);
-
-	const computeGroupBounds = useCallback(
-		(nodeIds: string[]) => {
-			const live: Array<Node<OperationFlowNodeData>> = [];
-			for (const nodeId of nodeIds) {
-				const node = nodesById.get(nodeId);
-				if (node) live.push(node);
-			}
-			return computeBoundsFromNodes(live);
-		},
-		[nodesById],
-	);
-
-	const openGroupEditor = useCallback(
-		(groupId: string) => {
-			const g = groups[groupId];
-			if (!g) return;
-			setSelectedGroupId(groupId);
-			setGroupEditor({
-				groupId,
-				name: (g.name ?? '').trim(),
-				bg: typeof g.bg === 'string' ? g.bg : '',
-			});
-		},
-		[groups],
-	);
-
-	const groupLabelDrag = useGroupLabelDrag({
-		flow,
-		groups,
-		nodesRef,
-		setNodes,
-		onSelectGroup: (groupId) => setSelectedGroupId(groupId),
-		onOpenGroupEditor: openGroupEditor,
-		markLayoutDirty: () => setIsLayoutDirty(true),
-	});
-
-	// Keep groups consistent when nodes are removed.
-	useEffect(() => {
-		// Important: avoid pruning while nodes are still initializing (prevents mount-time loops).
-		if (nodes.length === 0) return;
-		const nodeIdsKey = nodes.map((n) => String(n.id)).join('\u001f');
-		if (prevNodeIdsKeyRef.current === nodeIdsKey) return;
-		prevNodeIdsKeyRef.current = nodeIdsKey;
-
-		const existing = new Set(nodes.map((n) => String(n.id)));
-
-		setGroups((prev) => {
-			const pruned: Record<string, EditorGroup> = {};
-			for (const [groupId, g] of Object.entries(prev)) {
-				const name = (g?.name ?? '').trim();
-				const nodeIds = Array.isArray(g?.nodeIds) ? g.nodeIds.filter((id) => existing.has(id)) : [];
-				if (!groupId || !name || nodeIds.length === 0) continue;
-				const bg = typeof g?.bg === 'string' && g.bg.trim() ? g.bg.trim() : undefined;
-				pruned[groupId] = { name, nodeIds: [...new Set(nodeIds)], bg };
-			}
-
-			const sameKeys = Object.keys(pruned).length === Object.keys(prev).length && Object.keys(pruned).every((k) => prev[k]);
-			const sameContent =
-				sameKeys &&
-				Object.entries(pruned).every(([k, v]) => {
-					const g = prev[k];
-					if (!g) return false;
-					if ((g.name ?? '').trim() !== v.name) return false;
-					const a = [...new Set(g.nodeIds ?? [])].slice().sort();
-					const b = [...new Set(v.nodeIds ?? [])].slice().sort();
-					return a.length === b.length && a.every((id, idx) => id === b[idx]);
-				});
-
-			if (sameContent) return prev;
-			setIsLayoutDirty(true);
-			return pruned;
-		});
-	}, [nodes]);
-
-	// If selected group disappeared, clear selection.
-	useEffect(() => {
-		if (!selectedGroupId) return;
-		if (!groups[selectedGroupId]) setSelectedGroupId(null);
-	}, [groups, selectedGroupId]);
-
-	// If opened group editor group disappeared, close editor.
-	useEffect(() => {
-		if (!groupEditor) return;
-		if (!groups[groupEditor.groupId]) setGroupEditor(null);
-	}, [groupEditor, groups]);
-
-	const onConnect = useCallback((conn: Connection) => {
-		didConnectRef.current = true;
-		if (!conn.source || !conn.target) return;
-		if (conn.source === conn.target) return;
-		const nextOperations = applyConnectionToOperations(methods.getValues().operations, conn);
-		replace(nextOperations);
-	}, [methods, replace]);
-
-	const onConnectStart = useCallback((
-		_: unknown,
-		params: { nodeId?: string | null; handleType?: 'source' | 'target' | null; handleId?: string | null },
-	) => {
-		didConnectRef.current = false;
-		connectingSourceRef.current =
-			params.handleType === 'source' && params.nodeId
-				? { sourceId: String(params.nodeId), sourceHandle: params.handleId ?? null }
-				: null;
-	}, []);
-
-	const onConnectEnd = useCallback((event: MouseEvent | TouchEvent) => {
-		const pendingConnection = connectingSourceRef.current;
-		connectingSourceRef.current = null;
-
-		if (!pendingConnection?.sourceId) return;
-		if (didConnectRef.current) return;
-		if (!flow) return;
-
-		const target = event.target as HTMLElement | null;
-		const isPane = Boolean(target?.closest?.('.react-flow__pane'));
-		if (!isPane) return;
-
-		const p =
-			'touches' in event && event.touches?.[0]
-				? { x: event.touches[0].clientX, y: event.touches[0].clientY }
-				: 'changedTouches' in event && event.changedTouches?.[0]
-					? { x: event.changedTouches[0].clientX, y: event.changedTouches[0].clientY }
-					: 'clientX' in event && typeof event.clientX === 'number' && typeof event.clientY === 'number'
-						? { x: event.clientX, y: event.clientY }
-						: null;
-		if (!p) return;
-
-		// Create new operation at drop position and connect source -> new (new.dependsOn=[source]).
-		const pos = (flow as any).screenToFlowPosition ? (flow as any).screenToFlowPosition(p) : null;
-		if (!pos || typeof pos.x !== 'number' || typeof pos.y !== 'number') return;
-
-		const next = makeDefaultOperation();
-		const nextOperation = connectSourceToOperation(next, {
-			source: pendingConnection.sourceId,
-			sourceHandle: pendingConnection.sourceHandle,
-		});
-		append(nextOperation);
-
-		setNodes((prev) => [
-			...prev,
-			{
-				id: nextOperation.opId,
-				type: 'operation',
-				position: { x: pos.x, y: pos.y },
-				zIndex: Z_INDEX.flow.node,
-				data: buildOperationFlowNodeData(nextOperation),
-			},
-		]);
-		setSelectedOpId(nextOperation.opId);
-		setIsLayoutDirty(true);
-		if (isCompactLayout) setViewState('inspector');
-		else setIsInspectorVisible(true);
-	}, [append, flow, isCompactLayout, setNodes]);
-
-	const onEdgesChange = useCallback((changes: EdgeChange[]) => {
-		const removed = changes.filter((c) => c.type === 'remove').map((c) => c.id);
-		if (removed.length === 0) return;
-
-		let nextOperations = methods.getValues().operations;
-		for (const id of removed) nextOperations = removeEdgeFromOperations(nextOperations, String(id));
-		replace(nextOperations);
-	}, [methods, replace]);
-
-	const onNodesChange = useCallback((changes: NodeChange[]) => {
-		onNodesChangeBase(changes as any);
-		if (changes.some((c) => c.type === 'position')) setIsLayoutDirty(true);
-	}, [onNodesChangeBase]);
-
-	const onSelectionChange = useCallback(
-		({ nodes: selectedNodes }: { nodes: Array<{ id: string | number }> }) => {
-			const ids = selectedNodes.map((n) => String(n.id));
-			setSelectedNodeIds((prev) => (areStringArraysEqual(prev, ids) ? prev : ids));
-		},
-		[areStringArraysEqual],
-	);
-
-	const onNodeClick = useCallback(
-		(_: unknown, node: Node) => {
-			setSelectedOpId(String(node.id));
-			if (isCompactLayout) setViewState('inspector');
-			else setIsInspectorVisible(true);
-		},
-		[isCompactLayout],
-	);
-
-	const onPaneClick = useCallback(() => {
-		closeContextMenu();
-		setSelectedOpId(null);
-		setSelectedNodeIds((prev) => (prev.length === 0 ? prev : []));
-		if (isCompactLayout) setViewState('graph');
-	}, [closeContextMenu, isCompactLayout]);
-
-	const onNodeDragStop = useCallback((_: unknown, node: Node) => {
-		setNodes((prev) => prev.map((n) => (String(n.id) === String(node.id) ? { ...n, position: node.position } : n)));
-		setIsLayoutDirty(true);
-	}, [setNodes]);
-
-	const autoLayout = useCallback(() => {
-		const opIds = extractOpIds(methods.getValues());
-		const deps = edgesToDeps(edges);
-		const positions = computeSimpleLayout(opIds, deps);
-		setNodes((prev) =>
-			prev.map((n) => {
-				const pos = positions[String(n.id)];
-				return pos ? { ...n, position: pos } : n;
-			}),
-		);
-		setIsLayoutDirty(true);
-	}, [edges, methods, setNodes]);
-
-	const deleteSelectedAction = useCallback(() => {
-		if (!window.confirm(t('operationProfiles.confirm.deleteSelectedOperations'))) return;
-		deleteSelectedNodes();
-	}, [deleteSelectedNodes, t]);
-
-	const ungroupSelectedAction = useCallback(() => {
-		if (!selectedGroupId) return;
-		if (!window.confirm(t('operationProfiles.confirm.ungroupSelected'))) return;
-		ungroupSelected();
-	}, [selectedGroupId, t, ungroupSelected]);
+	const createSelectedGroupAction = useCallback(() => {
+		createGroupFromSelection(selectedNodeIds);
+	}, [createGroupFromSelection, selectedNodeIds]);
 
 	const showGraphPanel = !isCompactLayout || viewState === 'graph';
 	const showInspectorPanel = isCompactLayout ? viewState === 'inspector' : isInspectorVisible;
@@ -754,7 +259,8 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 					<NodeEditorFormHeader
 						profileName={block.name}
 						isLayoutDirty={isLayoutDirty}
-						onAutoLayout={autoLayout}
+						onAutoLayout={runAutoLayout}
+						isAutoLayouting={isAutoLayouting}
 						onSave={onSave}
 						onClose={onClose}
 						onOpenHelp={() => setIsHelpOpen(true)}
@@ -810,7 +316,7 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 								onGroupLabelPointerUp={groupLabelDrag.onPointerUp}
 								onAddOperation={addOperation}
 								onDeleteSelected={deleteSelectedAction}
-								onCreateGroup={createGroupFromSelection}
+								onCreateGroup={createSelectedGroupAction}
 								selectedNodeCount={selectedNodeIds.length}
 								hasSelectedOperation={Boolean(selectedOpId)}
 								groupOptions={groupSelectData}
@@ -838,103 +344,24 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 					</Group>
 
 					{contextMenu && (
-						<Paper
-							withBorder
-							shadow="md"
-							className="opNodeContextMenu"
-							style={{ left: contextMenu.x, top: contextMenu.y }}
-							onContextMenu={(event) => event.preventDefault()}
-						>
-							{contextMenu.type === 'pane' && (
-								<Button variant="subtle" size="xs" fullWidth justify="flex-start" onClick={createOperationFromContext}>
-									{t('operationProfiles.nodeEditor.context.createBlock')}
-								</Button>
-							)}
-							{contextMenu.type === 'node' && (
-								<Button color="red" variant="subtle" size="xs" fullWidth justify="flex-start" onClick={deleteNodeFromContext}>
-									{t('operationProfiles.nodeEditor.context.deleteBlock')}
-								</Button>
-							)}
-							{contextMenu.type === 'edge' && (
-								<Stack gap={2}>
-									<Button color="red" variant="subtle" size="xs" fullWidth justify="flex-start" onClick={deleteEdgeFromContext}>
-										{t('operationProfiles.nodeEditor.context.deleteEdge')}
-									</Button>
-									<Button variant="subtle" size="xs" fullWidth justify="flex-start" onClick={insertOperationFromEdgeContext}>
-										{t('operationProfiles.nodeEditor.context.insertBlock')}
-									</Button>
-								</Stack>
-							)}
-						</Paper>
+						<NodeEditorContextMenu
+							state={contextMenu}
+							onCreateOperation={createOperationFromContext}
+							onDeleteNode={deleteNodeFromContext}
+							onDeleteEdge={deleteEdgeFromContext}
+							onInsertOperation={insertOperationFromEdgeContext}
+						/>
 					)}
 				</Stack>
 
 				<GroupEditorModal
 					draft={groupEditor}
 					onClose={() => setGroupEditor(null)}
-					onDelete={(groupId) => {
-						setGroups((prev) => {
-							if (!prev[groupId]) return prev;
-							const { [groupId]: _removed, ...rest } = prev;
-							return rest;
-						});
-						setSelectedGroupId((prev) => (prev === groupId ? null : prev));
-						setIsLayoutDirty(true);
-						setGroupEditor(null);
-					}}
-					onSave={(draft) => {
-						const id = draft.groupId;
-						const name = draft.name.trim();
-						const bgRaw = draft.bg.trim();
-						if (!name) return;
-
-						// Store an opaque base color; alpha is applied at render time.
-						const bg = normalizeCssColorToOpaqueRgbString(bgRaw, DEFAULT_GROUP_COLOR_HEX);
-
-						setGroups((prev) => {
-							const g = prev[id];
-							if (!g) return prev;
-							return { ...prev, [id]: { ...g, name, bg: bgRaw ? bg : undefined } };
-						});
-						setIsLayoutDirty(true);
-						setGroupEditor(null);
-					}}
+					onDelete={deleteGroup}
+					onSave={saveGroup}
 				/>
 
-				<Modal
-					opened={isHelpOpen}
-					onClose={() => setIsHelpOpen(false)}
-					title={t('operationProfiles.nodeEditor.help.title')}
-					zIndex={Z_INDEX.overlay.modal + 1}
-					centered
-				>
-					<Stack gap="md">
-						<Stack gap="xs">
-							<Text fw={700}>{t('operationProfiles.nodeEditor.help.hotkeysTitle')}</Text>
-							<List spacing="xs" size="sm">
-								<List.Item>
-									<Kbd>Shift</Kbd> {t('operationProfiles.nodeEditor.help.selectionDrag')}
-								</List.Item>
-								<List.Item>
-									<Kbd>Ctrl</Kbd> / <Kbd>Cmd</Kbd> / <Kbd>Shift</Kbd>{' '}
-									{t('operationProfiles.nodeEditor.help.multiSelect')}
-								</List.Item>
-								<List.Item>
-									<Kbd>Delete</Kbd> / <Kbd>Backspace</Kbd> {t('operationProfiles.nodeEditor.help.deleteSelected')}
-								</List.Item>
-							</List>
-						</Stack>
-
-						<Stack gap="xs">
-							<Text fw={700}>{t('operationProfiles.nodeEditor.help.contextTitle')}</Text>
-							<List spacing="xs" size="sm">
-								<List.Item>{t('operationProfiles.nodeEditor.help.contextPane')}</List.Item>
-								<List.Item>{t('operationProfiles.nodeEditor.help.contextNode')}</List.Item>
-								<List.Item>{t('operationProfiles.nodeEditor.help.contextEdge')}</List.Item>
-							</List>
-						</Stack>
-					</Stack>
-				</Modal>
+				<NodeEditorHelpModal opened={isHelpOpen} onClose={() => setIsHelpOpen(false)} />
 			</FormProvider>
 		</Modal>
 	);
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-actions.ts b/web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-actions.ts
new file mode 100644
index 00000000..4dd3c431
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-actions.ts
@@ -0,0 +1,373 @@
+import { type Connection, type Edge, type EdgeChange, type Node, type ReactFlowInstance } from '@xyflow/react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { Z_INDEX } from '@ui/z-index';
+
+import { makeDefaultOperation, type OperationProfileFormValues } from '../../form/operation-profile-form-mapping';
+import { buildOperationFlowNodeData } from '../flow/operation-flow-node-model';
+import {
+	applyConnectionToOperations,
+	connectSourceToOperation,
+	insertOperationBetweenEdge,
+	removeEdgeFromOperations,
+	removeOperationReferences,
+} from '../operation-graph';
+
+import type { NodeEditorViewState } from '../../ui/types';
+import type { OperationFlowNodeData } from '../flow/operation-flow-node';
+import type { FlowPosition, NodeEditorContextMenuState } from '../ui/node-editor-context-menu';
+import type { UseFieldArrayAppend, UseFieldArrayReplace, UseFormReturn } from 'react-hook-form';
+
+type PendingConnection = { sourceId: string; sourceHandle: string | null };
+
+type UseNodeEditorActionsParams = {
+	opened: boolean;
+	isCompactLayout: boolean;
+	flow: ReactFlowInstance | null;
+	flowWrapperRef: React.RefObject<HTMLDivElement | null>;
+	fieldsLength: number;
+	append: UseFieldArrayAppend<OperationProfileFormValues, 'operations'>;
+	replace: UseFieldArrayReplace<OperationProfileFormValues, 'operations'>;
+	methods: UseFormReturn<OperationProfileFormValues>;
+	edges: Edge[];
+	nodesById: Map<string, Node<OperationFlowNodeData>>;
+	setNodes: React.Dispatch<React.SetStateAction<Array<Node<OperationFlowNodeData>>>>;
+	setViewState: React.Dispatch<React.SetStateAction<NodeEditorViewState>>;
+	setIsInspectorVisible: React.Dispatch<React.SetStateAction<boolean>>;
+	onDirty: () => void;
+};
+
+function areStringArraysEqual(a: string[], b: string[]): boolean {
+	if (a === b) return true;
+	if (a.length !== b.length) return false;
+	for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
+	return true;
+}
+
+function isTextEditingTarget(target: EventTarget | null): boolean {
+	if (!target || !(target instanceof HTMLElement)) return false;
+	if (target.isContentEditable) return true;
+	const tag = target.tagName.toLowerCase();
+	if (tag === 'input' || tag === 'textarea' || tag === 'select') return true;
+	return Boolean(target.closest?.('[contenteditable="true"]'));
+}
+
+function readEventPoint(event: MouseEvent | TouchEvent): { x: number; y: number } | null {
+	if ('touches' in event && event.touches?.[0]) return { x: event.touches[0].clientX, y: event.touches[0].clientY };
+	if ('changedTouches' in event && event.changedTouches?.[0]) {
+		return { x: event.changedTouches[0].clientX, y: event.changedTouches[0].clientY };
+	}
+	if ('clientX' in event && typeof event.clientX === 'number' && typeof event.clientY === 'number') {
+		return { x: event.clientX, y: event.clientY };
+	}
+	return null;
+}
+
+export function useNodeEditorActions(params: UseNodeEditorActionsParams) {
+	const {
+		opened,
+		isCompactLayout,
+		flow,
+		flowWrapperRef,
+		fieldsLength,
+		append,
+		replace,
+		methods,
+		edges,
+		nodesById,
+		setNodes,
+		setViewState,
+		setIsInspectorVisible,
+		onDirty,
+	} = params;
+	const { t } = useTranslation();
+	const [selectedOpId, setSelectedOpId] = useState<string | null>(null);
+	const [selectedNodeIds, setSelectedNodeIds] = useState<string[]>([]);
+	const [contextMenu, setContextMenu] = useState<NodeEditorContextMenuState | null>(null);
+	const connectingSourceRef = useRef<PendingConnection | null>(null);
+	const didConnectRef = useRef(false);
+
+	const showInspector = useCallback(() => {
+		if (isCompactLayout) setViewState('inspector');
+		else setIsInspectorVisible(true);
+	}, [isCompactLayout, setIsInspectorVisible, setViewState]);
+
+	const closeContextMenu = useCallback(() => setContextMenu(null), []);
+
+	const resetActionState = useCallback(() => {
+		setSelectedOpId(null);
+		setSelectedNodeIds([]);
+		setContextMenu(null);
+	}, []);
+
+	const addOperationAt = useCallback(
+		(position?: FlowPosition) => {
+			const next = makeDefaultOperation();
+			append(next);
+			let nextPosition = position ?? { x: 0, y: fieldsLength * 160 };
+			if (!position && flow && flowWrapperRef.current) {
+				const rect = flowWrapperRef.current.getBoundingClientRect();
+				const center = { x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 };
+				const p = flow.screenToFlowPosition(center);
+				if (p && typeof p.x === 'number' && typeof p.y === 'number') nextPosition = { x: p.x, y: p.y };
+			}
+			setNodes((previous) => [
+				...previous,
+				{
+					id: next.opId,
+					type: 'operation',
+					position: nextPosition,
+					zIndex: Z_INDEX.flow.node,
+					data: buildOperationFlowNodeData(next),
+				},
+			]);
+			onDirty();
+			setSelectedOpId(next.opId);
+			showInspector();
+		},
+		[append, fieldsLength, flow, flowWrapperRef, onDirty, setNodes, showInspector],
+	);
+
+	const addOperation = useCallback(() => addOperationAt(), [addOperationAt]);
+
+	const deleteSelectedNodes = useCallback(() => {
+		const ids = selectedNodeIds.length ? selectedNodeIds : selectedOpId ? [selectedOpId] : [];
+		if (ids.length === 0) return;
+		let current = methods.getValues();
+		for (const removedOpId of ids) {
+			current = { ...current, operations: removeOperationReferences(current.operations, removedOpId) };
+		}
+		replace(current.operations.filter((operation) => !ids.includes(operation.opId)));
+		setNodes((previous) => previous.filter((node) => !ids.includes(String(node.id))));
+		setSelectedNodeIds((previous) => previous.filter((id) => !ids.includes(id)));
+		setSelectedOpId((previous) => (previous && ids.includes(previous) ? null : previous));
+		onDirty();
+		closeContextMenu();
+	}, [closeContextMenu, methods, onDirty, replace, selectedNodeIds, selectedOpId, setNodes]);
+
+	const deleteSelectedAction = useCallback(() => {
+		if (!window.confirm(t('operationProfiles.confirm.deleteSelectedOperations'))) return;
+		deleteSelectedNodes();
+	}, [deleteSelectedNodes, t]);
+
+	const openPaneContextMenu = useCallback(
+		(event: React.MouseEvent | MouseEvent) => {
+			event.preventDefault();
+			const client = { x: event.clientX, y: event.clientY };
+			const position = flow?.screenToFlowPosition(client) ?? { x: 0, y: 0 };
+			setContextMenu({
+				type: 'pane',
+				x: client.x,
+				y: client.y,
+				position: {
+					x: typeof position?.x === 'number' ? position.x : 0,
+					y: typeof position?.y === 'number' ? position.y : 0,
+				},
+			});
+		},
+		[flow],
+	);
+
+	const openNodeContextMenu = useCallback((event: React.MouseEvent, node: Node) => {
+		event.preventDefault();
+		event.stopPropagation();
+		const nodeId = String(node.id);
+		setSelectedOpId(nodeId);
+		setContextMenu({ type: 'node', x: event.clientX, y: event.clientY, nodeId });
+	}, []);
+
+	const openEdgeContextMenu = useCallback((event: React.MouseEvent, edge: Edge) => {
+		event.preventDefault();
+		event.stopPropagation();
+		setContextMenu({ type: 'edge', x: event.clientX, y: event.clientY, edgeId: String(edge.id) });
+	}, []);
+
+	const createOperationFromContext = useCallback(() => {
+		if (contextMenu?.type !== 'pane') return;
+		addOperationAt(contextMenu.position);
+		closeContextMenu();
+	}, [addOperationAt, closeContextMenu, contextMenu]);
+
+	const deleteNodeById = useCallback(
+		(nodeId: string) => {
+			const current = methods.getValues();
+			const nextOps = removeOperationReferences(current.operations, nodeId).filter((operation) => operation.opId !== nodeId);
+			replace(nextOps);
+			setNodes((previous) => previous.filter((node) => String(node.id) !== nodeId));
+			setSelectedNodeIds((previous) => previous.filter((id) => id !== nodeId));
+			setSelectedOpId((previous) => (previous === nodeId ? null : previous));
+			onDirty();
+			closeContextMenu();
+		},
+		[closeContextMenu, methods, onDirty, replace, setNodes],
+	);
+
+	const deleteNodeFromContext = useCallback(() => {
+		if (contextMenu?.type !== 'node') return;
+		if (!window.confirm(t('operationProfiles.confirm.deleteOperation'))) return;
+		deleteNodeById(contextMenu.nodeId);
+	}, [contextMenu, deleteNodeById, t]);
+
+	const deleteEdgeFromContext = useCallback(() => {
+		if (contextMenu?.type !== 'edge') return;
+		replace(removeEdgeFromOperations(methods.getValues().operations, contextMenu.edgeId));
+		onDirty();
+		closeContextMenu();
+	}, [closeContextMenu, contextMenu, methods, onDirty, replace]);
+
+	const insertOperationFromEdgeContext = useCallback(() => {
+		if (contextMenu?.type !== 'edge') return;
+		const edge = edges.find((item) => item.id === contextMenu.edgeId);
+		if (!edge) {
+			closeContextMenu();
+			return;
+		}
+		const sourceNode = nodesById.get(String(edge.source));
+		const targetNode = nodesById.get(String(edge.target));
+		const position = {
+			x: ((sourceNode?.position.x ?? 0) + (targetNode?.position.x ?? 0)) / 2,
+			y: ((sourceNode?.position.y ?? 0) + (targetNode?.position.y ?? 0)) / 2,
+		};
+		const next = makeDefaultOperation();
+		replace(insertOperationBetweenEdge(methods.getValues().operations, contextMenu.edgeId, next));
+		setNodes((previous) => [
+			...previous,
+			{ id: next.opId, type: 'operation', position, zIndex: Z_INDEX.flow.node, data: buildOperationFlowNodeData(next) },
+		]);
+		setSelectedOpId(next.opId);
+		onDirty();
+		closeContextMenu();
+		showInspector();
+	}, [closeContextMenu, contextMenu, edges, methods, nodesById, onDirty, replace, setNodes, showInspector]);
+
+	const onConnect = useCallback(
+		(connection: Connection) => {
+			didConnectRef.current = true;
+			if (!connection.source || !connection.target || connection.source === connection.target) return;
+			replace(applyConnectionToOperations(methods.getValues().operations, connection));
+		},
+		[methods, replace],
+	);
+
+	const onConnectStart = useCallback(
+		(_: unknown, params: { nodeId?: string | null; handleType?: 'source' | 'target' | null; handleId?: string | null }) => {
+			didConnectRef.current = false;
+			connectingSourceRef.current =
+				params.handleType === 'source' && params.nodeId
+					? { sourceId: String(params.nodeId), sourceHandle: params.handleId ?? null }
+					: null;
+		},
+		[],
+	);
+
+	const onConnectEnd = useCallback(
+		(event: MouseEvent | TouchEvent) => {
+			const pendingConnection = connectingSourceRef.current;
+			connectingSourceRef.current = null;
+			if (!pendingConnection?.sourceId || didConnectRef.current || !flow) return;
+			const target = event.target as HTMLElement | null;
+			if (!target?.closest?.('.react-flow__pane')) return;
+			const point = readEventPoint(event);
+			if (!point) return;
+			const position = flow.screenToFlowPosition(point);
+			const nextOperation = connectSourceToOperation(makeDefaultOperation(), {
+				source: pendingConnection.sourceId,
+				sourceHandle: pendingConnection.sourceHandle,
+			});
+			append(nextOperation);
+			setNodes((previous) => [
+				...previous,
+				{
+					id: nextOperation.opId,
+					type: 'operation',
+					position: { x: position.x, y: position.y },
+					zIndex: Z_INDEX.flow.node,
+					data: buildOperationFlowNodeData(nextOperation),
+				},
+			]);
+			setSelectedOpId(nextOperation.opId);
+			onDirty();
+			showInspector();
+		},
+		[append, flow, onDirty, setNodes, showInspector],
+	);
+
+	const onEdgesChange = useCallback(
+		(changes: EdgeChange[]) => {
+			const removed = changes.filter((change) => change.type === 'remove').map((change) => change.id);
+			if (removed.length === 0) return;
+			let nextOperations = methods.getValues().operations;
+			for (const id of removed) nextOperations = removeEdgeFromOperations(nextOperations, String(id));
+			replace(nextOperations);
+		},
+		[methods, replace],
+	);
+
+	const onSelectionChange = useCallback(({ nodes }: { nodes: Array<{ id: string | number }> }) => {
+		const ids = nodes.map((node) => String(node.id));
+		setSelectedNodeIds((previous) => (areStringArraysEqual(previous, ids) ? previous : ids));
+	}, []);
+
+	const onNodeClick = useCallback(
+		(_: unknown, node: Node) => {
+			setSelectedOpId(String(node.id));
+			showInspector();
+		},
+		[showInspector],
+	);
+
+	const onPaneClick = useCallback(() => {
+		closeContextMenu();
+		setSelectedOpId(null);
+		setSelectedNodeIds((previous) => (previous.length === 0 ? previous : []));
+		if (isCompactLayout) setViewState('graph');
+	}, [closeContextMenu, isCompactLayout, setViewState]);
+
+	const onNodeDragStop = useCallback(
+		(_: unknown, node: Node) => {
+			setNodes((previous) => previous.map((item) => (String(item.id) === String(node.id) ? { ...item, position: node.position } : item)));
+			onDirty();
+		},
+		[onDirty, setNodes],
+	);
+
+	useEffect(() => {
+		if (!opened) return;
+		const onKeyDown = (event: KeyboardEvent) => {
+			if (event.defaultPrevented || isTextEditingTarget(event.target)) return;
+			if (event.key !== 'Delete' && event.key !== 'Backspace') return;
+			deleteSelectedNodes();
+			event.preventDefault();
+		};
+		window.addEventListener('keydown', onKeyDown);
+		return () => window.removeEventListener('keydown', onKeyDown);
+	}, [deleteSelectedNodes, opened]);
+
+	return {
+		selectedOpId,
+		setSelectedOpId,
+		selectedNodeIds,
+		setSelectedNodeIds,
+		contextMenu,
+		closeContextMenu,
+		resetActionState,
+		addOperation,
+		deleteSelectedAction,
+		openPaneContextMenu,
+		openNodeContextMenu,
+		openEdgeContextMenu,
+		createOperationFromContext,
+		deleteNodeFromContext,
+		deleteEdgeFromContext,
+		insertOperationFromEdgeContext,
+		onConnect,
+		onConnectStart,
+		onConnectEnd,
+		onEdgesChange,
+		onSelectionChange,
+		onNodeClick,
+		onPaneClick,
+		onNodeDragStop,
+	};
+}
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-flow-state.ts b/web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-flow-state.ts
new file mode 100644
index 00000000..98483b9c
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-flow-state.ts
@@ -0,0 +1,167 @@
+import { type Edge, type Node, type NodeChange, type ReactFlowInstance, useNodesState } from '@xyflow/react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { Z_INDEX } from '@ui/z-index';
+
+import { buildOperationFlowNodeData } from '../flow/operation-flow-node-model';
+import { computeSimpleLayout, readNodeEditorMeta } from '../meta/node-editor-meta';
+import { computeOperationAutoLayout } from '../utils/layout';
+import { mergeOperationNodes, type OperationNodeDraft } from '../utils/node-state';
+
+import type { FormOperation, OperationProfileFormValues } from '../../form/operation-profile-form-mapping';
+import type { OperationFlowNodeData } from '../flow/operation-flow-node';
+
+type UseNodeEditorFlowStateParams = {
+	opened: boolean;
+	blockId: string;
+	blockMeta: unknown;
+	initialValues: OperationProfileFormValues;
+	nodeDrafts: OperationNodeDraft[];
+	edges: Edge[];
+	onDirty: () => void;
+};
+
+function edgesToDeps(edges: Array<{ source: string; target: string }>): Array<{ source: string; target: string }> {
+	return edges.map((edge) => ({ source: edge.source, target: edge.target }));
+}
+
+function extractOpIds(values: OperationProfileFormValues): string[] {
+	return values.operations.map((operation) => operation.opId).filter(Boolean);
+}
+
+function buildNodesFromOperations(
+	operations: FormOperation[],
+	positions: Record<string, { x: number; y: number }>,
+): Array<Node<OperationFlowNodeData>> {
+	return operations.map((operation) => ({
+		id: operation.opId,
+		type: 'operation',
+		position: positions[operation.opId] ?? { x: 0, y: 0 },
+		zIndex: Z_INDEX.flow.node,
+		data: buildOperationFlowNodeData(operation),
+	}));
+}
+
+function readNodeSize(node: Node<OperationFlowNodeData>): { width: number; height: number } {
+	const width = node.measured?.width ?? node.width ?? 260;
+	const height = node.measured?.height ?? node.height ?? 80;
+	return {
+		width: Number.isFinite(width) && width > 0 ? width : 260,
+		height: Number.isFinite(height) && height > 0 ? height : 80,
+	};
+}
+
+export function useNodeEditorFlowState(params: UseNodeEditorFlowStateParams) {
+	const { opened, blockId, blockMeta, initialValues, nodeDrafts, edges, onDirty } = params;
+	const [flow, setFlow] = useState<ReactFlowInstance | null>(null);
+	const [isAutoLayouting, setIsAutoLayouting] = useState(false);
+	const flowWrapperRef = useRef<HTMLDivElement | null>(null);
+	const nodesRef = useRef<Array<Node<OperationFlowNodeData>>>([]);
+	const signaturesRef = useRef<Map<string, string>>(new Map());
+	const [nodes, setNodes, onNodesChangeBase] = useNodesState<Node<OperationFlowNodeData>>([]);
+
+	const fallbackPositions = useMemo(
+		() => computeSimpleLayout(nodeDrafts.map((draft) => draft.opId), edgesToDeps(edges)),
+		[nodeDrafts, edges],
+	);
+
+	const resetNodesFromInitialValues = useCallback(() => {
+		const meta = readNodeEditorMeta(blockMeta);
+		const resetEdges = edgesToDeps(edges);
+		const resetFallback = computeSimpleLayout(extractOpIds(initialValues), resetEdges);
+		const positions = { ...resetFallback, ...(meta?.nodes ?? {}) };
+		const nextNodes = buildNodesFromOperations(initialValues.operations, positions);
+		signaturesRef.current = new Map(nodeDrafts.map((draft) => [draft.opId, draft.signature]));
+		setNodes(nextNodes);
+	}, [blockMeta, edges, initialValues, nodeDrafts, setNodes]);
+
+	useEffect(() => {
+		nodesRef.current = nodes;
+	}, [nodes]);
+
+	useEffect(() => {
+		if (!opened) return;
+		const meta = readNodeEditorMeta(blockMeta);
+		const positions = { ...fallbackPositions, ...(meta?.nodes ?? {}) };
+		const nextNodes = nodeDrafts.map((draft) => ({
+			id: draft.opId,
+			type: 'operation',
+			position: positions[draft.opId] ?? { x: 0, y: 0 },
+			zIndex: Z_INDEX.flow.node,
+			data: draft.data,
+		}));
+		signaturesRef.current = new Map(nodeDrafts.map((draft) => [draft.opId, draft.signature]));
+		setNodes(nextNodes);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [opened, blockId]);
+
+	useEffect(() => {
+		if (!opened || !flow) return;
+		const viewport = readNodeEditorMeta(blockMeta)?.viewport;
+		if (!viewport) return;
+		void flow.setViewport(viewport, { duration: 0 });
+	}, [opened, blockId, blockMeta, flow]);
+
+	useEffect(() => {
+		if (!opened) return;
+		setNodes((previous) => {
+			const result = mergeOperationNodes({
+				previous,
+				drafts: nodeDrafts,
+				previousSignatures: signaturesRef.current,
+				fallbackPositions,
+				zIndex: Z_INDEX.flow.node,
+			});
+			signaturesRef.current = result.signatures;
+			return result.nodes;
+		});
+	}, [fallbackPositions, nodeDrafts, opened, setNodes]);
+
+	const onNodesChange = useCallback(
+		(changes: NodeChange[]) => {
+			onNodesChangeBase(changes as Parameters<typeof onNodesChangeBase>[0]);
+			if (changes.some((change) => change.type === 'position')) onDirty();
+		},
+		[onDirty, onNodesChangeBase],
+	);
+
+	const runAutoLayout = useCallback(async () => {
+		const currentNodes = nodesRef.current;
+		if (currentNodes.length === 0) return;
+		setIsAutoLayouting(true);
+		try {
+			const positions = await computeOperationAutoLayout({
+				nodes: currentNodes.map((node) => {
+					const size = readNodeSize(node);
+					return { id: String(node.id), ...size };
+				}),
+				edges: edges.map((edge) => ({ id: edge.id, source: String(edge.source), target: String(edge.target) })),
+			});
+			setNodes((previous) =>
+				previous.map((node) => {
+					const position = positions[String(node.id)];
+					return position ? { ...node, position } : node;
+				}),
+			);
+			onDirty();
+			window.requestAnimationFrame(() => {
+				void flow?.fitView({ padding: 0.2, duration: 180 });
+			});
+		} finally {
+			setIsAutoLayouting(false);
+		}
+	}, [edges, flow, onDirty, setNodes]);
+
+	return {
+		flow,
+		setFlow,
+		flowWrapperRef,
+		nodes,
+		setNodes,
+		nodesRef,
+		onNodesChange,
+		resetNodesFromInitialValues,
+		runAutoLayout,
+		isAutoLayouting,
+	};
+}
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-groups.ts b/web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-groups.ts
new file mode 100644
index 00000000..ab6154d2
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/hooks/use-node-editor-groups.ts
@@ -0,0 +1,212 @@
+import { type Node, type ReactFlowInstance } from '@xyflow/react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { v4 as uuidv4 } from 'uuid';
+
+import { computeBoundsFromNodes } from '../utils/bounds';
+import { DEFAULT_GROUP_COLOR_HEX, normalizeCssColorToOpaqueRgbString } from '../utils/color';
+
+import { useGroupLabelDrag } from './use-group-label-drag';
+
+import type { OperationFlowNodeData } from '../flow/operation-flow-node';
+import type { GroupEditorDraft } from '../ui/group-editor-modal';
+import type { EditorGroup } from '../ui/group-overlays';
+
+type UseNodeEditorGroupsParams = {
+	flow: ReactFlowInstance | null;
+	nodes: Array<Node<OperationFlowNodeData>>;
+	nodesById: Map<string, Node<OperationFlowNodeData>>;
+	nodesRef: React.MutableRefObject<Array<Node<OperationFlowNodeData>>>;
+	setNodes: React.Dispatch<React.SetStateAction<Array<Node<OperationFlowNodeData>>>>;
+	onDirty: () => void;
+};
+
+function normalizeGroups(
+	groups: Record<string, EditorGroup>,
+	existingIds?: Set<string>,
+): Record<string, EditorGroup> {
+	const next: Record<string, EditorGroup> = {};
+	for (const [groupId, group] of Object.entries(groups)) {
+		const name = (group?.name ?? '').trim();
+		const nodeIdsRaw = Array.isArray(group?.nodeIds) ? group.nodeIds : [];
+		const nodeIds = existingIds ? nodeIdsRaw.filter((id) => existingIds.has(id)) : nodeIdsRaw;
+		if (!groupId || !name || nodeIds.length === 0) continue;
+		const bg = typeof group?.bg === 'string' && group.bg.trim() ? group.bg.trim() : undefined;
+		next[groupId] = { name, nodeIds: [...new Set(nodeIds)], bg };
+	}
+	return next;
+}
+
+function areGroupsEqual(a: Record<string, EditorGroup>, b: Record<string, EditorGroup>): boolean {
+	const aKeys = Object.keys(a);
+	const bKeys = Object.keys(b);
+	if (aKeys.length !== bKeys.length) return false;
+	for (const key of aKeys) {
+		const left = a[key];
+		const right = b[key];
+		if (!left || !right) return false;
+		if (left.name !== right.name || (left.bg ?? '') !== (right.bg ?? '')) return false;
+		const leftIds = [...new Set(left.nodeIds ?? [])].sort();
+		const rightIds = [...new Set(right.nodeIds ?? [])].sort();
+		if (leftIds.length !== rightIds.length) return false;
+		if (!leftIds.every((id, index) => id === rightIds[index])) return false;
+	}
+	return true;
+}
+
+export function useNodeEditorGroups(params: UseNodeEditorGroupsParams) {
+	const { flow, nodes, nodesById, nodesRef, setNodes, onDirty } = params;
+	const { t } = useTranslation();
+	const [groups, setGroups] = useState<Record<string, EditorGroup>>({});
+	const [selectedGroupId, setSelectedGroupId] = useState<string | null>(null);
+	const [groupEditor, setGroupEditor] = useState<GroupEditorDraft | null>(null);
+	const prevNodeIdsKeyRef = useRef<string>('');
+
+	const resetGroups = useCallback((nextGroups: Record<string, EditorGroup>) => {
+		prevNodeIdsKeyRef.current = '';
+		setGroups(nextGroups);
+		setSelectedGroupId(null);
+		setGroupEditor(null);
+	}, []);
+
+	const groupSelectData = useMemo(
+		() => Object.entries(groups).map(([value, group]) => ({ value, label: group.name })),
+		[groups],
+	);
+
+	const computeGroupBounds = useCallback(
+		(nodeIds: string[]) => {
+			const live: Array<Node<OperationFlowNodeData>> = [];
+			for (const nodeId of nodeIds) {
+				const node = nodesById.get(nodeId);
+				if (node) live.push(node);
+			}
+			return computeBoundsFromNodes(live);
+		},
+		[nodesById],
+	);
+
+	const openGroupEditor = useCallback(
+		(groupId: string) => {
+			const group = groups[groupId];
+			if (!group) return;
+			setSelectedGroupId(groupId);
+			setGroupEditor({
+				groupId,
+				name: (group.name ?? '').trim(),
+				bg: typeof group.bg === 'string' ? group.bg : '',
+			});
+		},
+		[groups],
+	);
+
+	const groupLabelDrag = useGroupLabelDrag({
+		flow,
+		groups,
+		nodesRef,
+		setNodes,
+		onSelectGroup: (groupId) => setSelectedGroupId(groupId),
+		onOpenGroupEditor: openGroupEditor,
+		markLayoutDirty: onDirty,
+	});
+
+	const createGroupFromSelection = useCallback(
+		(nodeIds: string[]) => {
+			const ids = [...new Set(nodeIds)].filter(Boolean);
+			if (ids.length < 2) return;
+			const suggestedName = t('operationProfiles.nodeEditor.groupNameDefault', { index: Object.keys(groups).length + 1 });
+			const name = window.prompt(t('operationProfiles.nodeEditor.groupNamePrompt'), suggestedName);
+			if (!name?.trim()) return;
+			const groupId = uuidv4();
+			setGroups((previous) => ({ ...previous, [groupId]: { name: name.trim(), nodeIds: ids } }));
+			setSelectedGroupId(groupId);
+			onDirty();
+		},
+		[groups, onDirty, t],
+	);
+
+	const ungroupSelected = useCallback(() => {
+		if (!selectedGroupId) return;
+		setGroups((previous) => {
+			if (!previous[selectedGroupId]) return previous;
+			const { [selectedGroupId]: _removed, ...rest } = previous;
+			return rest;
+		});
+		setSelectedGroupId(null);
+		setGroupEditor((previous) => (previous?.groupId === selectedGroupId ? null : previous));
+		onDirty();
+	}, [onDirty, selectedGroupId]);
+
+	const ungroupSelectedAction = useCallback(() => {
+		if (!selectedGroupId) return;
+		if (!window.confirm(t('operationProfiles.confirm.ungroupSelected'))) return;
+		ungroupSelected();
+	}, [selectedGroupId, t, ungroupSelected]);
+
+	const deleteGroup = useCallback(
+		(groupId: string) => {
+			setGroups((previous) => {
+				if (!previous[groupId]) return previous;
+				const { [groupId]: _removed, ...rest } = previous;
+				return rest;
+			});
+			setSelectedGroupId((previous) => (previous === groupId ? null : previous));
+			setGroupEditor(null);
+			onDirty();
+		},
+		[onDirty],
+	);
+
+	const saveGroup = useCallback(
+		(draft: GroupEditorDraft) => {
+			const id = draft.groupId;
+			const name = draft.name.trim();
+			const bgRaw = draft.bg.trim();
+			if (!name) return;
+			const bg = normalizeCssColorToOpaqueRgbString(bgRaw, DEFAULT_GROUP_COLOR_HEX);
+			setGroups((previous) => {
+				const group = previous[id];
+				if (!group) return previous;
+				return { ...previous, [id]: { ...group, name, bg: bgRaw ? bg : undefined } };
+			});
+			setGroupEditor(null);
+			onDirty();
+		},
+		[onDirty],
+	);
+
+	useEffect(() => {
+		if (nodes.length === 0) return;
+		const nodeIdsKey = nodes.map((node) => String(node.id)).join('\u001f');
+		if (prevNodeIdsKeyRef.current === nodeIdsKey) return;
+		prevNodeIdsKeyRef.current = nodeIdsKey;
+		const existingIds = new Set(nodes.map((node) => String(node.id)));
+		setGroups((previous) => {
+			const next = normalizeGroups(previous, existingIds);
+			if (areGroupsEqual(previous, next)) return previous;
+			onDirty();
+			return next;
+		});
+	}, [nodes, onDirty]);
+
+	useEffect(() => {
+		if (selectedGroupId && !groups[selectedGroupId]) setSelectedGroupId(null);
+		if (groupEditor && !groups[groupEditor.groupId]) setGroupEditor(null);
+	}, [groupEditor, groups, selectedGroupId]);
+
+	return {
+		groups,
+		resetGroups,
+		selectedGroupId,
+		setSelectedGroupId,
+		groupEditor,
+		setGroupEditor,
+		groupSelectData,
+		computeGroupBounds,
+		groupLabelDrag,
+		createGroupFromSelection,
+		ungroupSelectedAction,
+		deleteGroup,
+		saveGroup,
+	};
+}
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/meta/node-editor-meta.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/meta/node-editor-meta.test.ts
new file mode 100644
index 00000000..bd7ae688
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/meta/node-editor-meta.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest';
+
+import { readNodeEditorMeta, writeNodeEditorMeta } from './node-editor-meta';
+
+describe('node editor meta', () => {
+	it('round-trips viewport data while preserving other meta', () => {
+		const written = writeNodeEditorMeta(
+			{ owner: 'test' },
+			{
+				version: 1,
+				nodes: { 'op-1': { x: 10, y: 20 } },
+				viewport: { x: -100, y: -50, zoom: 0.75 },
+			},
+		);
+
+		expect(written).toMatchObject({ owner: 'test' });
+		expect(readNodeEditorMeta(written)).toEqual({
+			version: 1,
+			nodes: { 'op-1': { x: 10, y: 20 } },
+			viewport: { x: -100, y: -50, zoom: 0.75 },
+		});
+	});
+
+	it('ignores invalid viewport data', () => {
+		expect(
+			readNodeEditorMeta({
+				nodeEditor: {
+					version: 1,
+					nodes: {},
+					viewport: { x: 1, y: 'bad', zoom: 1 },
+				},
+			})?.viewport,
+		).toBeUndefined();
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-context-menu.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-context-menu.tsx
new file mode 100644
index 00000000..2b667a6d
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-context-menu.tsx
@@ -0,0 +1,59 @@
+import { Button, Paper, Stack } from '@mantine/core';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+export type FlowPosition = { x: number; y: number };
+
+export type NodeEditorContextMenuState =
+	| { type: 'pane'; x: number; y: number; position: FlowPosition }
+	| { type: 'node'; x: number; y: number; nodeId: string }
+	| { type: 'edge'; x: number; y: number; edgeId: string };
+
+type Props = {
+	state: NodeEditorContextMenuState;
+	onCreateOperation: () => void;
+	onDeleteNode: () => void;
+	onDeleteEdge: () => void;
+	onInsertOperation: () => void;
+};
+
+export const NodeEditorContextMenu: React.FC<Props> = ({
+	state,
+	onCreateOperation,
+	onDeleteNode,
+	onDeleteEdge,
+	onInsertOperation,
+}) => {
+	const { t } = useTranslation();
+
+	return (
+		<Paper
+			withBorder
+			shadow="md"
+			className="opNodeContextMenu"
+			style={{ left: state.x, top: state.y }}
+			onContextMenu={(event) => event.preventDefault()}
+		>
+			{state.type === 'pane' && (
+				<Button variant="subtle" size="xs" fullWidth justify="flex-start" onClick={onCreateOperation}>
+					{t('operationProfiles.nodeEditor.context.createBlock')}
+				</Button>
+			)}
+			{state.type === 'node' && (
+				<Button color="red" variant="subtle" size="xs" fullWidth justify="flex-start" onClick={onDeleteNode}>
+					{t('operationProfiles.nodeEditor.context.deleteBlock')}
+				</Button>
+			)}
+			{state.type === 'edge' && (
+				<Stack gap={2}>
+					<Button color="red" variant="subtle" size="xs" fullWidth justify="flex-start" onClick={onDeleteEdge}>
+						{t('operationProfiles.nodeEditor.context.deleteEdge')}
+					</Button>
+					<Button variant="subtle" size="xs" fullWidth justify="flex-start" onClick={onInsertOperation}>
+						{t('operationProfiles.nodeEditor.context.insertBlock')}
+					</Button>
+				</Stack>
+			)}
+		</Paper>
+	);
+};
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx
index 573d329e..46543494 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-form-header.tsx
@@ -8,7 +8,8 @@ import type { OperationProfileFormValues } from '../../form/operation-profile-fo
 type Props = {
 	profileName: string;
 	isLayoutDirty: boolean;
-	onAutoLayout: () => void;
+	onAutoLayout: () => void | Promise<void>;
+	isAutoLayouting: boolean;
 	onSave: () => void;
 	onClose: () => void;
 	onOpenHelp: () => void;
@@ -21,6 +22,7 @@ export const NodeEditorFormHeader: React.FC<Props> = ({
 	profileName,
 	isLayoutDirty,
 	onAutoLayout,
+	isAutoLayouting,
 	onSave,
 	onClose,
 	onOpenHelp,
@@ -36,6 +38,7 @@ export const NodeEditorFormHeader: React.FC<Props> = ({
 			profileName={profileName}
 			isDirty={isLayoutDirty || isFormDirty}
 			onAutoLayout={onAutoLayout}
+			isAutoLayouting={isAutoLayouting}
 			onSave={onSave}
 			onClose={onClose}
 			onOpenHelp={onOpenHelp}
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-header.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-header.tsx
index 46c9ad4f..becd62ce 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-header.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-header.tsx
@@ -8,7 +8,8 @@ import { TOOLTIP_PORTAL_SETTINGS } from '@ui/z-index';
 type Props = {
 	profileName: string;
 	isDirty: boolean;
-	onAutoLayout: () => void;
+	onAutoLayout: () => void | Promise<void>;
+	isAutoLayouting: boolean;
 	onSave: () => void;
 	onClose: () => void;
 	onOpenHelp: () => void;
@@ -21,6 +22,7 @@ export const NodeEditorHeader: React.FC<Props> = ({
 	profileName,
 	isDirty,
 	onAutoLayout,
+	isAutoLayouting,
 	onSave,
 	onClose,
 	onOpenHelp,
@@ -55,7 +57,7 @@ export const NodeEditorHeader: React.FC<Props> = ({
 						{isInspectorVisible ? t('operationProfiles.nodeEditor.hideOperation') : t('operationProfiles.nodeEditor.showOperation')}
 					</Button>
 				)}
-				<Button variant="light" leftSection={<LuLayoutDashboard />} onClick={onAutoLayout}>
+				<Button variant="light" leftSection={<LuLayoutDashboard />} loading={isAutoLayouting} onClick={onAutoLayout}>
 					{t('operationProfiles.nodeEditor.autoLayout')}
 				</Button>
 				<Button leftSection={<LuSave />} disabled={!isDirty} onClick={onSave}>
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-help-modal.tsx b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-help-modal.tsx
new file mode 100644
index 00000000..aed8e510
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/ui/node-editor-help-modal.tsx
@@ -0,0 +1,50 @@
+import { Kbd, List, Modal, Stack, Text } from '@mantine/core';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { Z_INDEX } from '@ui/z-index';
+
+type Props = {
+	opened: boolean;
+	onClose: () => void;
+};
+
+export const NodeEditorHelpModal: React.FC<Props> = ({ opened, onClose }) => {
+	const { t } = useTranslation();
+
+	return (
+		<Modal
+			opened={opened}
+			onClose={onClose}
+			title={t('operationProfiles.nodeEditor.help.title')}
+			zIndex={Z_INDEX.overlay.modal + 1}
+			centered
+		>
+			<Stack gap="md">
+				<Stack gap="xs">
+					<Text fw={700}>{t('operationProfiles.nodeEditor.help.hotkeysTitle')}</Text>
+					<List spacing="xs" size="sm">
+						<List.Item>
+							<Kbd>Shift</Kbd> {t('operationProfiles.nodeEditor.help.selectionDrag')}
+						</List.Item>
+						<List.Item>
+							<Kbd>Ctrl</Kbd> / <Kbd>Cmd</Kbd> / <Kbd>Shift</Kbd> {t('operationProfiles.nodeEditor.help.multiSelect')}
+						</List.Item>
+						<List.Item>
+							<Kbd>Delete</Kbd> / <Kbd>Backspace</Kbd> {t('operationProfiles.nodeEditor.help.deleteSelected')}
+						</List.Item>
+					</List>
+				</Stack>
+
+				<Stack gap="xs">
+					<Text fw={700}>{t('operationProfiles.nodeEditor.help.contextTitle')}</Text>
+					<List spacing="xs" size="sm">
+						<List.Item>{t('operationProfiles.nodeEditor.help.contextPane')}</List.Item>
+						<List.Item>{t('operationProfiles.nodeEditor.help.contextNode')}</List.Item>
+						<List.Item>{t('operationProfiles.nodeEditor.help.contextEdge')}</List.Item>
+					</List>
+				</Stack>
+			</Stack>
+		</Modal>
+	);
+};
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/utils/layout.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/utils/layout.test.ts
new file mode 100644
index 00000000..2b739b5c
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/utils/layout.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from 'vitest';
+
+import { computeOperationAutoLayout } from './layout';
+
+describe('node editor auto layout', () => {
+	it('places dependencies from left to right', async () => {
+		const positions = await computeOperationAutoLayout({
+			nodes: [
+				{ id: 'source', width: 260, height: 80 },
+				{ id: 'middle', width: 260, height: 80 },
+				{ id: 'target', width: 260, height: 80 },
+			],
+			edges: [
+				{ source: 'source', target: 'middle' },
+				{ source: 'middle', target: 'target' },
+			],
+		});
+
+		expect(positions.source.x).toBeLessThan(positions.middle.x);
+		expect(positions.middle.x).toBeLessThan(positions.target.x);
+	});
+
+	it('keeps branch targets separated by node height', async () => {
+		const positions = await computeOperationAutoLayout({
+			nodes: [
+				{ id: 'guard', width: 260, height: 160 },
+				{ id: 'battle', width: 260, height: 80 },
+				{ id: 'night', width: 260, height: 80 },
+			],
+			edges: [
+				{ source: 'guard', target: 'battle' },
+				{ source: 'guard', target: 'night' },
+			],
+		});
+
+		expect(positions.guard.x).toBeLessThan(positions.battle.x);
+		expect(positions.guard.x).toBeLessThan(positions.night.x);
+		expect(Math.abs(positions.battle.y - positions.night.y)).toBeGreaterThanOrEqual(104);
+	});
+
+	it('keeps disconnected nodes in stable order', async () => {
+		const positions = await computeOperationAutoLayout({
+			nodes: [
+				{ id: 'first', width: 260, height: 80 },
+				{ id: 'second', width: 260, height: 80 },
+				{ id: 'third', width: 260, height: 80 },
+			],
+			edges: [],
+		});
+
+		expect(positions.first.y).toBeLessThan(positions.second.y);
+		expect(positions.second.y).toBeLessThan(positions.third.y);
+	});
+
+	it('returns finite deterministic positions for cycles', async () => {
+		const input = {
+			nodes: [
+				{ id: 'a', width: 260, height: 80 },
+				{ id: 'b', width: 260, height: 80 },
+				{ id: 'c', width: 260, height: 80 },
+			],
+			edges: [
+				{ source: 'a', target: 'b' },
+				{ source: 'b', target: 'c' },
+				{ source: 'c', target: 'a' },
+			],
+		};
+
+		const first = await computeOperationAutoLayout(input);
+		const second = await computeOperationAutoLayout(input);
+
+		expect(Object.keys(first).sort()).toEqual(['a', 'b', 'c']);
+		for (const position of Object.values(first)) {
+			expect(Number.isFinite(position.x)).toBe(true);
+			expect(Number.isFinite(position.y)).toBe(true);
+		}
+		expect(second).toEqual(first);
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/utils/layout.ts b/web/src/features/sidebars/operation-profiles/node-editor/utils/layout.ts
index d5e07054..2c79e89b 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/utils/layout.ts
+++ b/web/src/features/sidebars/operation-profiles/node-editor/utils/layout.ts
@@ -1,6 +1,108 @@
-/**
- * Placeholder module for planned extraction.
- * Will host layout algorithms for node editor (beyond simple layout).
- */
-export {};
+import ELK from 'elkjs/lib/elk.bundled.js';
 
+import type { ElkExtendedEdge, ElkNode } from 'elkjs/lib/elk-api';
+
+const DEFAULT_NODE_WIDTH = 260;
+const DEFAULT_NODE_HEIGHT = 80;
+const LAYER_SPACING = 120;
+const NODE_SPACING = 64;
+
+const elk = new ELK();
+
+export type OperationLayoutNode = {
+	id: string;
+	width?: number;
+	height?: number;
+};
+
+export type OperationLayoutEdge = {
+	id?: string;
+	source: string;
+	target: string;
+};
+
+export type OperationLayoutPosition = {
+	x: number;
+	y: number;
+};
+
+export type OperationAutoLayoutInput = {
+	nodes: OperationLayoutNode[];
+	edges: OperationLayoutEdge[];
+};
+
+function readSize(value: number | undefined, fallback: number): number {
+	return typeof value === 'number' && Number.isFinite(value) && value > 0 ? value : fallback;
+}
+
+function stackDisconnected(nodes: OperationLayoutNode[]): Record<string, OperationLayoutPosition> {
+	const positions: Record<string, OperationLayoutPosition> = {};
+	let y = 0;
+	for (const node of nodes) {
+		positions[node.id] = { x: 0, y };
+		y += readSize(node.height, DEFAULT_NODE_HEIGHT) + NODE_SPACING;
+	}
+	return positions;
+}
+
+function buildElkGraph(input: OperationAutoLayoutInput): ElkNode {
+	const nodeIds = new Set(input.nodes.map((node) => node.id));
+	const children: ElkNode[] = input.nodes.map((node) => ({
+		id: node.id,
+		width: readSize(node.width, DEFAULT_NODE_WIDTH),
+		height: readSize(node.height, DEFAULT_NODE_HEIGHT),
+	}));
+	const edges: ElkExtendedEdge[] = input.edges
+		.filter((edge) => edge.source !== edge.target && nodeIds.has(edge.source) && nodeIds.has(edge.target))
+		.map((edge, index) => ({
+			id: edge.id ?? `${edge.source}->${edge.target}:${index}`,
+			sources: [edge.source],
+			targets: [edge.target],
+		}));
+
+	return {
+		id: 'operation-node-editor-layout',
+		children,
+		edges,
+		layoutOptions: {
+			'elk.algorithm': 'layered',
+			'elk.direction': 'RIGHT',
+			'elk.spacing.nodeNode': String(NODE_SPACING),
+			'elk.layered.spacing.nodeNodeBetweenLayers': String(LAYER_SPACING),
+			'elk.layered.spacing.edgeNodeBetweenLayers': '48',
+			'elk.layered.crossingMinimization.strategy': 'LAYER_SWEEP',
+			'elk.layered.nodePlacement.strategy': 'NETWORK_SIMPLEX',
+			'elk.layered.considerModelOrder.strategy': 'NODES_AND_EDGES',
+			'elk.separateConnectedComponents': 'true',
+			'elk.spacing.componentComponent': String(NODE_SPACING * 2),
+		},
+	};
+}
+
+function normalizePositions(children: ElkNode[] | undefined, inputNodes: OperationLayoutNode[]): Record<string, OperationLayoutPosition> {
+	if (!children?.length) return stackDisconnected(inputNodes);
+
+	const raw = new Map(children.map((child) => [child.id, { x: child.x ?? 0, y: child.y ?? 0 }]));
+	const minX = Math.min(...Array.from(raw.values(), (position) => position.x));
+	const minY = Math.min(...Array.from(raw.values(), (position) => position.y));
+	const positions: Record<string, OperationLayoutPosition> = {};
+
+	for (const node of inputNodes) {
+		const position = raw.get(node.id) ?? { x: 0, y: 0 };
+		positions[node.id] = {
+			x: Math.round(position.x - minX),
+			y: Math.round(position.y - minY),
+		};
+	}
+
+	return positions;
+}
+
+export async function computeOperationAutoLayout(input: OperationAutoLayoutInput): Promise<Record<string, OperationLayoutPosition>> {
+	if (input.nodes.length === 0) return {};
+	if (input.edges.length === 0) return stackDisconnected(input.nodes);
+
+	const graph = buildElkGraph(input);
+	const result = await elk.layout(graph);
+	return normalizePositions(result.children, input.nodes);
+}
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.test.ts
new file mode 100644
index 00000000..47997511
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.test.ts
@@ -0,0 +1,85 @@
+import { describe, expect, it } from 'vitest';
+
+import { mergeOperationNodes } from './node-state';
+
+import type { OperationFlowNodeData } from '../flow/operation-flow-node';
+import type { Node } from '@xyflow/react';
+
+function makeData(overrides: Partial<OperationFlowNodeData> = {}): OperationFlowNodeData {
+	return {
+		opId: 'op-1',
+		name: 'Operation',
+		description: '',
+		kind: 'template',
+		isEnabled: true,
+		isRequired: false,
+		guardOutputs: [],
+		...overrides,
+	};
+}
+
+describe('node editor node state merge', () => {
+	it('preserves node identity when signature and position stay the same', () => {
+		const data = makeData();
+		const previous: Array<Node<OperationFlowNodeData>> = [
+			{
+				id: 'op-1',
+				type: 'operation',
+				position: { x: 10, y: 20 },
+				data,
+				measured: { width: 260, height: 80 },
+			},
+		];
+
+		const result = mergeOperationNodes({
+			previous,
+			drafts: [{ opId: 'op-1', data: makeData(), signature: 'same' }],
+			previousSignatures: new Map([['op-1', 'same']]),
+			fallbackPositions: { 'op-1': { x: 0, y: 0 } },
+		});
+
+		expect(result.changed).toBe(false);
+		expect(result.nodes[0]).toBe(previous[0]);
+	});
+
+	it('preserves React Flow measurement fields when node data changes', () => {
+		const previous: Array<Node<OperationFlowNodeData>> = [
+			{
+				id: 'op-1',
+				type: 'operation',
+				position: { x: 10, y: 20 },
+				data: makeData({ name: 'Before' }),
+				measured: { width: 260, height: 80 },
+				width: 260,
+				height: 80,
+			},
+		];
+
+		const result = mergeOperationNodes({
+			previous,
+			drafts: [{ opId: 'op-1', data: makeData({ name: 'After' }), signature: 'after' }],
+			previousSignatures: new Map([['op-1', 'before']]),
+			fallbackPositions: { 'op-1': { x: 0, y: 0 } },
+		});
+
+		expect(result.changed).toBe(true);
+		expect(result.nodes[0]).not.toBe(previous[0]);
+		expect(result.nodes[0]?.position).toEqual({ x: 10, y: 20 });
+		expect(result.nodes[0]?.measured).toEqual({ width: 260, height: 80 });
+		expect(result.nodes[0]?.width).toBe(260);
+		expect(result.nodes[0]?.height).toBe(80);
+		expect(result.nodes[0]?.data.name).toBe('After');
+	});
+
+	it('uses fallback positions only for new nodes', () => {
+		const result = mergeOperationNodes({
+			previous: [],
+			drafts: [{ opId: 'op-1', data: makeData(), signature: 'new' }],
+			previousSignatures: new Map(),
+			fallbackPositions: { 'op-1': { x: 320, y: 160 } },
+		});
+
+		expect(result.changed).toBe(true);
+		expect(result.nodes[0]?.position).toEqual({ x: 320, y: 160 });
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.ts b/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.ts
new file mode 100644
index 00000000..99cf0808
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.ts
@@ -0,0 +1,73 @@
+import { buildOperationFlowNodeSignature } from '../flow/operation-flow-node-model';
+
+import type { OperationFlowNodeData } from '../flow/operation-flow-node';
+import type { Node } from '@xyflow/react';
+
+export type OperationNodeDraft = {
+	opId: string;
+	data: OperationFlowNodeData;
+	signature: string;
+};
+
+type MergeOperationNodesParams = {
+	previous: Array<Node<OperationFlowNodeData>>;
+	drafts: OperationNodeDraft[];
+	previousSignatures: Map<string, string>;
+	fallbackPositions: Record<string, { x: number; y: number }>;
+	zIndex?: number;
+};
+
+type MergeOperationNodesResult = {
+	nodes: Array<Node<OperationFlowNodeData>>;
+	changed: boolean;
+	signatures: Map<string, string>;
+};
+
+function hasSameNodeShape(a: Node<OperationFlowNodeData>, b: Node<OperationFlowNodeData>): boolean {
+	return (
+		String(a.id) === String(b.id) &&
+		(a.type ?? '') === (b.type ?? '') &&
+		(a.position?.x ?? 0) === (b.position?.x ?? 0) &&
+		(a.position?.y ?? 0) === (b.position?.y ?? 0) &&
+		buildOperationFlowNodeSignature(a.data) === buildOperationFlowNodeSignature(b.data)
+	);
+}
+
+export function mergeOperationNodes(params: MergeOperationNodesParams): MergeOperationNodesResult {
+	const { previous, drafts, previousSignatures, fallbackPositions, zIndex } = params;
+	const previousById = new Map(previous.map((node) => [String(node.id), node]));
+	const nextSignatures = new Map<string, string>();
+	let changed = previous.length !== drafts.length;
+
+	const nodes = drafts.map((draft) => {
+		const existing = previousById.get(draft.opId);
+		nextSignatures.set(draft.opId, draft.signature);
+
+		if (existing && previousSignatures.get(draft.opId) === draft.signature) {
+			return existing;
+		}
+
+		const nextNode = {
+			...(existing ?? {}),
+			id: draft.opId,
+			type: 'operation',
+			position: existing?.position ?? fallbackPositions[draft.opId] ?? { x: 0, y: 0 },
+			zIndex: existing?.zIndex ?? zIndex,
+			data: draft.data,
+		} satisfies Node<OperationFlowNodeData>;
+
+		if (!existing || !hasSameNodeShape(existing, nextNode)) changed = true;
+		return nextNode;
+	});
+
+	if (!changed) {
+		for (let i = 0; i < nodes.length; i++) {
+			if (nodes[i] !== previous[i]) {
+				changed = true;
+				break;
+			}
+		}
+	}
+
+	return { nodes: changed ? nodes : previous, changed, signatures: nextSignatures };
+}
diff --git a/web/yarn.lock b/web/yarn.lock
index 66b52443..8a9bb2bc 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -2194,6 +2194,11 @@ electron-to-chromium@^1.5.263:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz#5d84f2df8cdb6bfe7e873706bb21bd4bfb574dc7"
   integrity sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==
 
+elkjs@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.11.1.tgz#d27fcdbbf5a8aeeff80420d17d1666f78cfc8544"
+  integrity sha512-zxxR9k+rx5ktMwT/FwyLdPCrq7xN6e4VGGHH8hA01vVYKjTFik7nHOxBnAYtrgYUB1RpAiLvA1/U2YraWxyKKg==
+
 embla-carousel-react@8.5.2:
   version "8.5.2"
   resolved "https://registry.yarnpkg.com/embla-carousel-react/-/embla-carousel-react-8.5.2.tgz#f79f6c36690596fe2aceec994372ab84bfbfd9cc"

From 4c7329c4b9e326abd3d381972325bf13ed101ccf Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Fri, 24 Apr 2026 17:31:48 +0300
Subject: [PATCH 45/54] fix: keep node editor cards and errors in sync

---
 .../node-editor/block-node-editor-modal.tsx   |  4 +-
 .../node-editor/utils/node-state.test.ts      | 33 ++++++++++++-
 .../node-editor/utils/node-state.ts           |  2 +-
 .../utils/operation-error-message.test.ts     | 47 +++++++++++++++++++
 .../utils/operation-error-message.ts          | 24 ++++++++++
 5 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/utils/operation-error-message.test.ts
 create mode 100644 web/src/features/sidebars/operation-profiles/node-editor/utils/operation-error-message.ts

diff --git a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
index a0cf0842..1eb1d3b0 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
+++ b/web/src/features/sidebars/operation-profiles/node-editor/block-node-editor-modal.tsx
@@ -32,6 +32,7 @@ import { NodeEditorFormHeader } from './ui/node-editor-form-header';
 import { NodeEditorGraphPanel } from './ui/node-editor-graph-panel';
 import { NodeEditorHelpModal } from './ui/node-editor-help-modal';
 import { NodeEditorInspectorPanel } from './ui/node-editor-inspector-panel';
+import { addOperationNamesToErrorMessage } from './utils/operation-error-message';
 
 import type { OperationFlowNodeData } from './flow/operation-flow-node';
 import type { OperationBlockDto } from '../../../../api/chat-core';
@@ -230,7 +231,8 @@ export const OperationBlockNodeEditorModal: React.FC<Props> = ({
 			await onSaveDraft(values, writeNodeEditorMeta(block.meta, nodeEditorMeta));
 			setIsLayoutDirty(false);
 		} catch (e) {
-			setJsonError(e instanceof Error ? e.message : String(e));
+			const message = e instanceof Error ? e.message : String(e);
+			setJsonError(addOperationNamesToErrorMessage(message, values.operations));
 		}
 	});
 
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.test.ts
index 47997511..22a9e08a 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.test.ts
+++ b/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.test.ts
@@ -1,5 +1,7 @@
 import { describe, expect, it } from 'vitest';
 
+import { buildOperationFlowNodeSignature } from '../flow/operation-flow-node-model';
+
 import { mergeOperationNodes } from './node-state';
 
 import type { OperationFlowNodeData } from '../flow/operation-flow-node';
@@ -33,8 +35,8 @@ describe('node editor node state merge', () => {
 
 		const result = mergeOperationNodes({
 			previous,
-			drafts: [{ opId: 'op-1', data: makeData(), signature: 'same' }],
-			previousSignatures: new Map([['op-1', 'same']]),
+			drafts: [{ opId: 'op-1', data: makeData(), signature: buildOperationFlowNodeSignature(data) }],
+			previousSignatures: new Map([['op-1', buildOperationFlowNodeSignature(data)]]),
 			fallbackPositions: { 'op-1': { x: 0, y: 0 } },
 		});
 
@@ -71,6 +73,33 @@ describe('node editor node state merge', () => {
 		expect(result.nodes[0]?.data.name).toBe('After');
 	});
 
+	it('updates stale node data even when signature cache already matches the draft', () => {
+		const previousData = makeData({ kind: 'template' });
+		const nextData = makeData({ kind: 'llm' });
+		const nextSignature = buildOperationFlowNodeSignature(nextData);
+		const previous: Array<Node<OperationFlowNodeData>> = [
+			{
+				id: 'op-1',
+				type: 'operation',
+				position: { x: 10, y: 20 },
+				data: previousData,
+				measured: { width: 260, height: 80 },
+			},
+		];
+
+		const result = mergeOperationNodes({
+			previous,
+			drafts: [{ opId: 'op-1', data: nextData, signature: nextSignature }],
+			previousSignatures: new Map([['op-1', nextSignature]]),
+			fallbackPositions: { 'op-1': { x: 0, y: 0 } },
+		});
+
+		expect(result.changed).toBe(true);
+		expect(result.nodes[0]).not.toBe(previous[0]);
+		expect(result.nodes[0]?.data.kind).toBe('llm');
+		expect(result.nodes[0]?.measured).toEqual({ width: 260, height: 80 });
+	});
+
 	it('uses fallback positions only for new nodes', () => {
 		const result = mergeOperationNodes({
 			previous: [],
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.ts b/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.ts
index 99cf0808..7bb8a413 100644
--- a/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.ts
+++ b/web/src/features/sidebars/operation-profiles/node-editor/utils/node-state.ts
@@ -43,7 +43,7 @@ export function mergeOperationNodes(params: MergeOperationNodesParams): MergeOpe
 		const existing = previousById.get(draft.opId);
 		nextSignatures.set(draft.opId, draft.signature);
 
-		if (existing && previousSignatures.get(draft.opId) === draft.signature) {
+		if (existing && previousSignatures.get(draft.opId) === draft.signature && buildOperationFlowNodeSignature(existing.data) === draft.signature) {
 			return existing;
 		}
 
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/utils/operation-error-message.test.ts b/web/src/features/sidebars/operation-profiles/node-editor/utils/operation-error-message.test.ts
new file mode 100644
index 00000000..3cff4ff8
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/utils/operation-error-message.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from 'vitest';
+
+import { makeDefaultOperation, type OperationProfileFormValues } from '../../form/operation-profile-form-mapping';
+
+import { addOperationNamesToErrorMessage } from './operation-error-message';
+
+function makeValues(): OperationProfileFormValues {
+	return {
+		name: 'Block',
+		description: '',
+		enabled: true,
+		executionMode: 'concurrent',
+		operationProfileSessionId: 'session',
+		operations: [
+			{ ...makeDefaultOperation(), opId: 'first', name: 'First node' },
+			{ ...makeDefaultOperation(), opId: 'second', name: 'Second node' },
+			{ ...makeDefaultOperation(), opId: 'third', name: 'Third node' },
+			{ ...makeDefaultOperation(), opId: 'fourth', name: 'Fourth node' },
+			{ ...makeDefaultOperation(), opId: 'fifth', name: 'New operation' },
+		],
+	};
+}
+
+describe('operation error message formatting', () => {
+	it('adds operation names to Russian indexed validation errors', () => {
+		const message = addOperationNamesToErrorMessage(
+			'Операция #5 LLM токен: обязательное поле; Операция #5 промпт: обязательное поле',
+			makeValues().operations,
+		);
+
+		expect(message).toBe(
+			'Операция #5 "New operation" LLM токен: обязательное поле; Операция #5 "New operation" промпт: обязательное поле',
+		);
+	});
+
+	it('adds operation names to English indexed validation errors', () => {
+		const message = addOperationNamesToErrorMessage('Operation #2 prompt: required field', makeValues().operations);
+
+		expect(message).toBe('Operation #2 "Second node" prompt: required field');
+	});
+
+	it('leaves messages unchanged when the operation index is unknown', () => {
+		const message = addOperationNamesToErrorMessage('Операция #9 prompt: required field', makeValues().operations);
+
+		expect(message).toBe('Операция #9 prompt: required field');
+	});
+});
diff --git a/web/src/features/sidebars/operation-profiles/node-editor/utils/operation-error-message.ts b/web/src/features/sidebars/operation-profiles/node-editor/utils/operation-error-message.ts
new file mode 100644
index 00000000..04e7ffd9
--- /dev/null
+++ b/web/src/features/sidebars/operation-profiles/node-editor/utils/operation-error-message.ts
@@ -0,0 +1,24 @@
+import type { OperationProfileFormValues } from '../../form/operation-profile-form-mapping';
+
+function escapeOperationLabel(value: string): string {
+	return value.replace(/"/g, '\\"');
+}
+
+function getOperationLabel(operations: OperationProfileFormValues['operations'], index: number): string | null {
+	const operation = operations[index - 1];
+	if (!operation) return null;
+	const label = operation.name.trim() || operation.opId.trim();
+	return label ? escapeOperationLabel(label) : null;
+}
+
+export function addOperationNamesToErrorMessage(
+	message: string,
+	operations: OperationProfileFormValues['operations'],
+): string {
+	return message.replace(/(Операция|Operation)\s+#(\d+)(?!\s*["“])/g, (match, prefix: string, indexRaw: string) => {
+		const index = Number(indexRaw);
+		if (!Number.isInteger(index) || index < 1) return match;
+		const label = getOperationLabel(operations, index);
+		return label ? `${prefix} #${index} "${label}"` : match;
+	});
+}

From 8623546243cdcf089a9a5834545741bfeafc461e Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Fri, 24 Apr 2026 21:39:05 +0300
Subject: [PATCH 46/54] fix: ignore ST preset sampler settings in generation
 runtime

---
 .../chat-core/instruction-st-preset.test.ts   |  52 +++++-
 .../prompt-template-renderer.test.ts          |  22 +++
 .../chat-core/prompt-template-renderer.ts     | 149 ++-------------
 .../chat-core/sillytavern-template-syntax.ts  | 170 ++++++++++++++++++
 .../services/chat-core/st-prompt-runtime.ts   |  50 +-----
 .../prompt/build-base-prompt.test.ts          |   7 +-
 6 files changed, 261 insertions(+), 189 deletions(-)
 create mode 100644 server/src/services/chat-core/sillytavern-template-syntax.ts

diff --git a/server/src/services/chat-core/instruction-st-preset.test.ts b/server/src/services/chat-core/instruction-st-preset.test.ts
index 99282013..b98334af 100644
--- a/server/src/services/chat-core/instruction-st-preset.test.ts
+++ b/server/src/services/chat-core/instruction-st-preset.test.ts
@@ -223,10 +223,7 @@ describe("instruction-st-base", () => {
     expect(resolved.systemPrompt).toBe("Main Lilly");
     expect(resolved.preHistorySystemMessages).toEqual(["WI BEFORE"]);
     expect(resolved.postHistorySystemMessages).toEqual(["Post Dima"]);
-    expect(resolved.derivedSettings).toMatchObject({
-      temperature: 0.65,
-      maxTokens: 333,
-    });
+    expect(resolved.derivedSettings).toEqual({});
     expect(resolved.usedPromptIdentifiers).toEqual([
       "main",
       "worldInfoBefore",
@@ -235,6 +232,53 @@ describe("instruction-st-base", () => {
     ]);
   });
 
+  test("shares ST variables across ordered prompt blocks", async () => {
+    const stBase = createStBaseConfigFromPreset({
+      preset: {
+        chat_completion_source: "openai",
+        prompts: [
+          {
+            identifier: "roleToggle",
+            role: "system",
+            content: "{{setvar::prompt::an excellent protagonist}}{{trim}}",
+          },
+          {
+            identifier: "role",
+            role: "system",
+            content: "You are {{getvar::prompt}}!",
+          },
+        ],
+        prompt_order: [
+          {
+            character_id: 100001,
+            order: [
+              { identifier: "roleToggle", enabled: true },
+              { identifier: "role", enabled: true },
+            ],
+          },
+        ],
+      },
+      fileName: "Default.json",
+      sensitiveImportMode: "keep",
+    });
+
+    const resolved = await resolveStBaseInstructionRuntime({
+      stBase,
+      context: {
+        char: {},
+        user: {},
+        chat: {},
+        messages: [],
+        rag: {},
+        art: {},
+        now: new Date("2026-02-13T00:00:00.000Z").toISOString(),
+      },
+    });
+
+    expect(resolved.systemPrompt).toBe("You are an excellent protagonist!");
+    expect(resolved.usedPromptIdentifiers).toEqual(["role"]);
+  });
+
   test("collects in-chat prompts as ordered depth insertions", async () => {
     const stBase = createStBaseConfigFromPreset({
       preset: {
diff --git a/server/src/services/chat-core/prompt-template-renderer.test.ts b/server/src/services/chat-core/prompt-template-renderer.test.ts
index 039c7c51..32232658 100644
--- a/server/src/services/chat-core/prompt-template-renderer.test.ts
+++ b/server/src/services/chat-core/prompt-template-renderer.test.ts
@@ -22,6 +22,9 @@ describe("prompt-template-renderer", () => {
     expect(() => validateLiquidTemplate("Hello {{ user.name }}")).not.toThrow();
     expect(() => validateLiquidTemplate("{{outlet::default}}")).not.toThrow();
     expect(() => validateLiquidTemplate("{{random::A::B}}")).not.toThrow();
+    expect(() => validateLiquidTemplate("{{// Marinara's Spaghetti Recipe }}")).not.toThrow();
+    expect(() => validateLiquidTemplate("{{setvar::prompt::an excellent protagonist}}")).not.toThrow();
+    expect(() => validateLiquidTemplate("You are {{getvar::prompt}}!")).not.toThrow();
     expect(() => validateLiquidTemplate("{{ recentMessages(2) | size }}")).not.toThrow();
     expect(() => validateLiquidTemplate("{{ broken ")).toThrow();
   });
@@ -84,6 +87,25 @@ describe("prompt-template-renderer", () => {
     expect(rendered).toBe("X=OUTLET_TEXT");
   });
 
+  test("removes ST line comment macros before Liquid parsing", async () => {
+    const rendered = await renderLiquidTemplate({
+      templateText: "A{{// Marinara's Spaghetti Recipe }}B",
+      context: makeContext(),
+    });
+
+    expect(rendered).toBe("AB");
+  });
+
+  test("supports ST setvar and getvar macros during one render", async () => {
+    const rendered = await renderLiquidTemplate({
+      templateText:
+        "{{setvar::prompt::an excellent protagonist}}{{trim}}You are {{getvar::prompt}}!",
+      context: makeContext(),
+    });
+
+    expect(rendered).toBe("You are an excellent protagonist!");
+  });
+
   test("trim macro removes surrounding blank lines between WI blocks", async () => {
     const rendered = await renderLiquidTemplate({
       templateText: "Start\n\n{{ wiBefore }}\n{{ trim }}\n\n{{ wiAfter }}\n\nEnd",
diff --git a/server/src/services/chat-core/prompt-template-renderer.ts b/server/src/services/chat-core/prompt-template-renderer.ts
index ebe6f086..797169ba 100644
--- a/server/src/services/chat-core/prompt-template-renderer.ts
+++ b/server/src/services/chat-core/prompt-template-renderer.ts
@@ -1,5 +1,12 @@
 import { Liquid } from "liquidjs";
 
+import {
+  INTERNAL_MESSAGE_HELPER_FILTER,
+  preprocessSillyTavernTemplateSyntax,
+  type SillyTavernTemplateVariables,
+  stripSillyTavernTrimSentinel,
+} from "./sillytavern-template-syntax";
+
 export interface InstructionRenderContext {
   char: unknown;
   user: unknown;
@@ -54,15 +61,8 @@ export interface InstructionRenderContext {
 
 type RenderableMessage = { role: string; content: string };
 
-const INTERNAL_MESSAGE_HELPER_FILTER = "__tsMessageHelper";
-const RECENT_MESSAGE_HELPER_RE =
-  /\b(recentMessages(?:Text|ByContextTokens(?:Text)?)?)\s*\(\s*([^()]*)\s*\)/g;
-const LIQUID_SEGMENT_RE = /({{[\s\S]*?}}|{%[\s\S]*?%})/g;
-
 const DEFAULT_MAX_PASSES = 5;
 const DEFAULT_MAX_OUTPUT_CHARS = 200_000;
-const TRIM_SENTINEL = "__TS_LIQUID_TRIM_SENTINEL__";
-const MACRO_TAG_RE = /{{\s*([^{}]*?)\s*}}/g;
 
 function sanitizeRenderableMessages(messages: unknown): RenderableMessage[] {
   return Array.isArray(messages)
@@ -186,136 +186,6 @@ const engine = registerInternalFilters(
   })
 );
 
-function sanitizeOutletKey(value: string): string {
-  // Keep keys printable and stable for object lookup.
-  return value.trim().replace(/\\/g, "\\\\").replace(/'/g, "\\'");
-}
-
-function clampRngValue(value: number): number {
-  if (!Number.isFinite(value)) return 0;
-  if (value <= 0) return 0;
-  if (value >= 1) return 0.999_999_999_999;
-  return value;
-}
-
-function pickRandomOption(options: string[], rng: () => number): string {
-  const idx = Math.floor(clampRngValue(rng()) * options.length);
-  return options[idx] ?? options[0] ?? "";
-}
-
-function resolveRandomMacro(rawMacroBody: string, rng: () => number): string | null {
-  const prefix = "random::";
-  if (!rawMacroBody.startsWith(prefix)) return null;
-  const tail = rawMacroBody.slice(prefix.length);
-  if (!tail) return null;
-
-  const options = tail
-    .split("::")
-    .map((item) => item.trim())
-    .filter((item) => item.length > 0);
-  if (options.length === 0) return null;
-
-  return pickRandomOption(options, rng);
-}
-
-function rewriteRecentMessageHelperCalls(templateText: string): string {
-  return templateText.replace(LIQUID_SEGMENT_RE, (segment: string) => {
-    const isOutputSegment = segment.startsWith("{{") && segment.endsWith("}}");
-    const isTagSegment = segment.startsWith("{%") && segment.endsWith("%}");
-    if (!isOutputSegment && !isTagSegment) return segment;
-
-    const prefix = segment.slice(0, 2);
-    const suffix = segment.slice(-2);
-    const inner = segment.slice(2, -2);
-    const rewrittenInner = inner.replace(
-      RECENT_MESSAGE_HELPER_RE,
-      (_match: string, helperName: string, rawArg: string) => {
-        const normalizedArg = rawArg.trim().length > 0 ? rawArg.trim() : "nil";
-        return `'' | ${INTERNAL_MESSAGE_HELPER_FILTER}: '${helperName}', ${normalizedArg}`;
-      }
-    );
-    return `${prefix}${rewrittenInner}${suffix}`;
-  });
-}
-
-function preprocessSillyTavernTemplateSyntax(
-  templateText: string,
-  options?: { rng?: () => number }
-): {
-  text: string;
-  hasTrimSentinel: boolean;
-} {
-  const rng = options?.rng ?? Math.random;
-  let hasTrimSentinel = false;
-  const text = rewriteRecentMessageHelperCalls(templateText).replace(
-    MACRO_TAG_RE,
-    (full: string, rawMacroBody: string) => {
-      const macroBody = rawMacroBody.trim();
-      if (!macroBody) return full;
-
-      if (macroBody === "trim") {
-        hasTrimSentinel = true;
-        return TRIM_SENTINEL;
-      }
-
-      if (macroBody.startsWith("outlet::")) {
-        const rawKey = macroBody.slice("outlet::".length);
-        if (!rawKey.trim()) return full;
-        const key = sanitizeOutletKey(rawKey);
-        return `{{ outlet['${key}'] }}`;
-      }
-
-      if (macroBody.startsWith("random::")) {
-        const selected = resolveRandomMacro(macroBody, rng);
-        if (selected !== null) return selected;
-        // Keep malformed random macro literal in output.
-        return `{% raw %}${full}{% endraw %}`;
-      }
-
-      return full;
-    }
-  );
-
-  return { text, hasTrimSentinel };
-}
-
-function isBlankLine(line: string): boolean {
-  return line.trim().length === 0;
-}
-
-function stripTrimSentinel(text: string): string {
-  if (!text.includes(TRIM_SENTINEL)) return text;
-
-  const normalized = text.replace(/\r\n/g, "\n");
-  const lines = normalized.split("\n");
-  const out: string[] = [];
-  let skipLeadingBlankLines = false;
-
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (trimmed === TRIM_SENTINEL) {
-      while (out.length > 0 && isBlankLine(out[out.length - 1] ?? "")) out.pop();
-      skipLeadingBlankLines = true;
-      continue;
-    }
-
-    if (line.includes(TRIM_SENTINEL)) {
-      const replaced = line.split(TRIM_SENTINEL).join("");
-      if (!(skipLeadingBlankLines && isBlankLine(replaced))) {
-        out.push(replaced);
-      }
-      if (!isBlankLine(replaced)) skipLeadingBlankLines = false;
-      continue;
-    }
-
-    if (skipLeadingBlankLines && isBlankLine(line)) continue;
-    out.push(line);
-    if (!isBlankLine(line)) skipLeadingBlankLines = false;
-  }
-
-  return out.join("\n");
-}
-
 function normalizeToString(value: unknown): string {
   return typeof value === "string" ? value : String(value);
 }
@@ -383,6 +253,7 @@ export async function renderLiquidTemplate(params: {
      * Useful for deterministic tests.
      */
     rng?: () => number;
+    stVariables?: SillyTavernTemplateVariables;
   };
 }): Promise<string> {
   const renderEngine = params.options?.strictVariables
@@ -397,6 +268,7 @@ export async function renderLiquidTemplate(params: {
 
   const firstPassPreprocessed = preprocessSillyTavernTemplateSyntax(params.templateText, {
     rng: params.options?.rng,
+    variables: params.options?.stVariables,
   });
   sawTrimSentinel = sawTrimSentinel || firstPassPreprocessed.hasTrimSentinel;
 
@@ -415,6 +287,7 @@ export async function renderLiquidTemplate(params: {
     try {
       const passPreprocessed = preprocessSillyTavernTemplateSyntax(current, {
         rng: params.options?.rng,
+        variables: params.options?.stVariables,
       });
       sawTrimSentinel = sawTrimSentinel || passPreprocessed.hasTrimSentinel;
       const next = normalizeToString(
@@ -428,7 +301,7 @@ export async function renderLiquidTemplate(params: {
   }
 
   if (sawTrimSentinel) {
-    return stripTrimSentinel(current);
+    return stripSillyTavernTrimSentinel(current);
   }
 
   return current;
diff --git a/server/src/services/chat-core/sillytavern-template-syntax.ts b/server/src/services/chat-core/sillytavern-template-syntax.ts
new file mode 100644
index 00000000..6e8e4f04
--- /dev/null
+++ b/server/src/services/chat-core/sillytavern-template-syntax.ts
@@ -0,0 +1,170 @@
+export const INTERNAL_MESSAGE_HELPER_FILTER = "__tsMessageHelper";
+
+const RECENT_MESSAGE_HELPER_RE =
+  /\b(recentMessages(?:Text|ByContextTokens(?:Text)?)?)\s*\(\s*([^()]*)\s*\)/g;
+const LIQUID_SEGMENT_RE = /({{[\s\S]*?}}|{%[\s\S]*?%})/g;
+const MACRO_TAG_RE = /{{\s*([^{}]*?)\s*}}/g;
+const TRIM_SENTINEL = "__TS_LIQUID_TRIM_SENTINEL__";
+const SETVAR_PREFIX = "setvar::";
+const GETVAR_PREFIX = "getvar::";
+
+export type SillyTavernTemplateVariables = Record<string, string>;
+
+function sanitizeOutletKey(value: string): string {
+  return value.trim().replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+}
+
+function clampRngValue(value: number): number {
+  if (!Number.isFinite(value)) return 0;
+  if (value <= 0) return 0;
+  if (value >= 1) return 0.999_999_999_999;
+  return value;
+}
+
+function pickRandomOption(options: string[], rng: () => number): string {
+  const idx = Math.floor(clampRngValue(rng()) * options.length);
+  return options[idx] ?? options[0] ?? "";
+}
+
+function resolveRandomMacro(rawMacroBody: string, rng: () => number): string | null {
+  const prefix = "random::";
+  if (!rawMacroBody.startsWith(prefix)) return null;
+  const tail = rawMacroBody.slice(prefix.length);
+  if (!tail) return null;
+
+  const options = tail
+    .split("::")
+    .map((item) => item.trim())
+    .filter((item) => item.length > 0);
+  if (options.length === 0) return null;
+
+  return pickRandomOption(options, rng);
+}
+
+function rewriteRecentMessageHelperCalls(templateText: string): string {
+  return templateText.replace(LIQUID_SEGMENT_RE, (segment: string) => {
+    const isOutputSegment = segment.startsWith("{{") && segment.endsWith("}}");
+    const isTagSegment = segment.startsWith("{%") && segment.endsWith("%}");
+    if (!isOutputSegment && !isTagSegment) return segment;
+
+    const prefix = segment.slice(0, 2);
+    const suffix = segment.slice(-2);
+    const inner = segment.slice(2, -2);
+    const rewrittenInner = inner.replace(
+      RECENT_MESSAGE_HELPER_RE,
+      (_match: string, helperName: string, rawArg: string) => {
+        const normalizedArg = rawArg.trim().length > 0 ? rawArg.trim() : "nil";
+        return `'' | ${INTERNAL_MESSAGE_HELPER_FILTER}: '${helperName}', ${normalizedArg}`;
+      }
+    );
+    return `${prefix}${rewrittenInner}${suffix}`;
+  });
+}
+
+function parseSetVarMacro(
+  macroBody: string
+): { key: string; value: string } | null {
+  if (!macroBody.startsWith(SETVAR_PREFIX)) return null;
+  const tail = macroBody.slice(SETVAR_PREFIX.length);
+  const separatorIndex = tail.indexOf("::");
+  if (separatorIndex < 0) return null;
+
+  const key = tail.slice(0, separatorIndex).trim();
+  if (!key) return null;
+
+  return {
+    key,
+    value: tail.slice(separatorIndex + 2),
+  };
+}
+
+function parseGetVarMacro(macroBody: string): string | null {
+  if (!macroBody.startsWith(GETVAR_PREFIX)) return null;
+  const key = macroBody.slice(GETVAR_PREFIX.length).trim();
+  return key.length > 0 ? key : null;
+}
+
+export function preprocessSillyTavernTemplateSyntax(
+  templateText: string,
+  options?: { rng?: () => number; variables?: SillyTavernTemplateVariables }
+): {
+  text: string;
+  hasTrimSentinel: boolean;
+} {
+  const rng = options?.rng ?? Math.random;
+  const variables = options?.variables ?? {};
+  let hasTrimSentinel = false;
+  const text = rewriteRecentMessageHelperCalls(templateText).replace(
+    MACRO_TAG_RE,
+    (full: string, rawMacroBody: string) => {
+      const macroBody = rawMacroBody.trim();
+      if (!macroBody) return full;
+
+      if (macroBody === "trim") {
+        hasTrimSentinel = true;
+        return TRIM_SENTINEL;
+      }
+
+      if (macroBody.startsWith("//")) return "";
+
+      const setVar = parseSetVarMacro(macroBody);
+      if (setVar) {
+        variables[setVar.key] = setVar.value;
+        return "";
+      }
+
+      const getVarKey = parseGetVarMacro(macroBody);
+      if (getVarKey) return variables[getVarKey] ?? "";
+
+      if (macroBody.startsWith("outlet::")) {
+        const rawKey = macroBody.slice("outlet::".length);
+        if (!rawKey.trim()) return full;
+        return `{{ outlet['${sanitizeOutletKey(rawKey)}'] }}`;
+      }
+
+      if (macroBody.startsWith("random::")) {
+        const selected = resolveRandomMacro(macroBody, rng);
+        return selected !== null ? selected : `{% raw %}${full}{% endraw %}`;
+      }
+
+      return full;
+    }
+  );
+
+  return { text, hasTrimSentinel };
+}
+
+function isBlankLine(line: string): boolean {
+  return line.trim().length === 0;
+}
+
+export function stripSillyTavernTrimSentinel(text: string): string {
+  if (!text.includes(TRIM_SENTINEL)) return text;
+
+  const normalized = text.replace(/\r\n/g, "\n");
+  const lines = normalized.split("\n");
+  const out: string[] = [];
+  let skipLeadingBlankLines = false;
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed === TRIM_SENTINEL) {
+      while (out.length > 0 && isBlankLine(out[out.length - 1] ?? "")) out.pop();
+      skipLeadingBlankLines = true;
+      continue;
+    }
+
+    if (line.includes(TRIM_SENTINEL)) {
+      const replaced = line.split(TRIM_SENTINEL).join("");
+      if (!(skipLeadingBlankLines && isBlankLine(replaced))) out.push(replaced);
+      if (!isBlankLine(replaced)) skipLeadingBlankLines = false;
+      continue;
+    }
+
+    if (skipLeadingBlankLines && isBlankLine(line)) continue;
+    out.push(line);
+    if (!isBlankLine(line)) skipLeadingBlankLines = false;
+  }
+
+  return out.join("\n");
+}
diff --git a/server/src/services/chat-core/st-prompt-runtime.ts b/server/src/services/chat-core/st-prompt-runtime.ts
index 07a8d221..9dffe084 100644
--- a/server/src/services/chat-core/st-prompt-runtime.ts
+++ b/server/src/services/chat-core/st-prompt-runtime.ts
@@ -9,10 +9,10 @@ import { cloneStPromptWithDefaults } from "@shared/utils/st-prompts";
 import { renderLiquidTemplate } from "./prompt-template-renderer";
 
 import type { InstructionRenderContext } from "./prompt-template-renderer";
+import type { SillyTavernTemplateVariables } from "./sillytavern-template-syntax";
 import type {
   StBaseConfig,
   StBasePromptOrder,
-  StBaseResponseConfig,
 } from "@shared/types/instructions";
 
 type ResolvedDepthInsertion = {
@@ -74,48 +74,11 @@ function resolveDynamicPromptContent(params: {
   }
 }
 
-function toGatewaySettingsFromResponseConfig(
-  config: StBaseResponseConfig
-): Record<string, unknown> {
-  const settings: Record<string, unknown> = {};
-
-  if (typeof config.temperature === "number") settings.temperature = config.temperature;
-  if (typeof config.top_p === "number") settings.top_p = config.top_p;
-  if (typeof config.top_k === "number") settings.top_k = config.top_k;
-  if (typeof config.top_a === "number") settings.top_a = config.top_a;
-  if (typeof config.min_p === "number") settings.min_p = config.min_p;
-  if (typeof config.repetition_penalty === "number") {
-    settings.repetition_penalty = config.repetition_penalty;
-  }
-  if (typeof config.frequency_penalty === "number") {
-    settings.frequency_penalty = config.frequency_penalty;
-  }
-  if (typeof config.presence_penalty === "number") {
-    settings.presence_penalty = config.presence_penalty;
-  }
-  if (typeof config.openai_max_tokens === "number") {
-    settings.maxTokens = config.openai_max_tokens;
-  }
-  if (typeof config.seed === "number") settings.seed = config.seed;
-  if (typeof config.n === "number") settings.n = config.n;
-  if (typeof config.reasoning_effort === "string") {
-    settings.reasoning_effort = config.reasoning_effort;
-  }
-  if (typeof config.verbosity === "string") settings.verbosity = config.verbosity;
-  if (typeof config.enable_web_search === "boolean") {
-    settings.enable_web_search = config.enable_web_search;
-  }
-  if (typeof config.stream_openai === "boolean") {
-    settings.stream = config.stream_openai;
-  }
-
-  return settings;
-}
-
 async function renderPromptContent(params: {
   identifier: string;
   stBase: StBaseConfig;
   context: InstructionRenderContext;
+  stVariables: SillyTavernTemplateVariables;
 }): Promise<{
   content: string;
   role: "system" | "user" | "assistant";
@@ -142,6 +105,9 @@ async function renderPromptContent(params: {
   const rendered = await renderLiquidTemplate({
     templateText: rawContent,
     context: params.context,
+    options: {
+      stVariables: params.stVariables,
+    },
   });
   const content = rendered.trim();
   if (!content) return null;
@@ -190,6 +156,7 @@ export async function resolveStBaseInstructionRuntime(params: {
   const depthInsertions: ResolvedDepthInsertion[] = [];
   const usedPromptIdentifiers: string[] = [];
   let afterHistory = false;
+  const stVariables: SillyTavernTemplateVariables = {};
 
   for (const orderEntry of fallbackOrder) {
     if (!orderEntry.enabled) continue;
@@ -205,6 +172,7 @@ export async function resolveStBaseInstructionRuntime(params: {
       identifier,
       stBase: params.stBase,
       context: params.context,
+      stVariables,
     });
     if (!rendered) continue;
     usedPromptIdentifiers.push(identifier);
@@ -252,9 +220,7 @@ export async function resolveStBaseInstructionRuntime(params: {
     preHistorySystemMessages,
     postHistorySystemMessages,
     depthInsertions,
-    derivedSettings: toGatewaySettingsFromResponseConfig(
-      params.stBase.responseConfig
-    ),
+    derivedSettings: {},
     usedPromptIdentifiers,
   };
 }
diff --git a/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts b/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts
index a0fed87c..c94013c9 100644
--- a/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts
+++ b/server/src/services/chat-generation-v3/prompt/build-base-prompt.test.ts
@@ -138,7 +138,7 @@ describe("buildBasePrompt world-info integration", () => {
     );
   });
 
-  test("uses st_base instructions to build system/pre/post prompts and derived settings", async () => {
+  test("uses st_base instructions to build system/pre/post prompts without sampler settings", async () => {
     mocks.pickInstructionForChat.mockResolvedValue({
       id: "tpl-1",
       ownerId: "global",
@@ -206,10 +206,7 @@ describe("buildBasePrompt world-info integration", () => {
         postHistorySystemMessages: ["Post Dima"],
       })
     );
-    expect(out.instructionDerivedSettings).toMatchObject({
-      temperature: 0.6,
-      maxTokens: 444,
-    });
+    expect(out.instructionDerivedSettings).toEqual({});
   });
 
   test("allows st_base instruction with only in-chat prompts", async () => {

From 2bc479db89f8054c71b349a0bd6f6d9ec3053c5e Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 25 Apr 2026 02:05:19 +0300
Subject: [PATCH 47/54] fix: render markdown during streaming chat messages

---
 .../features/chat-window/message/index.tsx    |  1 -
 .../message/parts/parts-view.test.ts          | 69 +++++++++++++++++++
 .../chat-window/message/parts/parts-view.tsx  |  7 +-
 .../chat-window/message/parts/renderers.tsx   |  6 +-
 4 files changed, 72 insertions(+), 11 deletions(-)
 create mode 100644 web/src/features/chat-window/message/parts/parts-view.test.ts

diff --git a/web/src/features/chat-window/message/index.tsx b/web/src/features/chat-window/message/index.tsx
index eab8a889..0a60391c 100644
--- a/web/src/features/chat-window/message/index.tsx
+++ b/web/src/features/chat-window/message/index.tsx
@@ -517,7 +517,6 @@ const MessageInner: React.FC<MessageProps> = ({
 								entry={data.entry}
 								variant={data.variant}
 								currentTurn={currentTurn}
-								preferPlainText={isAssistant && isLast && isStreaming}
 								canMutateParts={canMutateParts}
 								editingPartId={editingPartId}
 								draftText={draftText}
diff --git a/web/src/features/chat-window/message/parts/parts-view.test.ts b/web/src/features/chat-window/message/parts/parts-view.test.ts
new file mode 100644
index 00000000..2ee47398
--- /dev/null
+++ b/web/src/features/chat-window/message/parts/parts-view.test.ts
@@ -0,0 +1,69 @@
+import { MantineProvider } from '@mantine/core';
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import '../../../../i18n';
+import { PartsView } from './parts-view';
+
+import type { Entry, Part, Variant } from '@shared/types/chat-entry-parts';
+
+function makeEntry(): Entry {
+	return {
+		entryId: 'entry_1',
+		chatId: 'chat_1',
+		branchId: 'branch_1',
+		role: 'assistant',
+		createdAt: Date.UTC(2026, 0, 1),
+		activeVariantId: 'variant_1',
+	};
+}
+
+function makeMarkdownPart(payload: string): Part {
+	return {
+		partId: 'part_1',
+		channel: 'main',
+		order: 0,
+		payload,
+		payloadFormat: 'markdown',
+		visibility: { ui: 'always', prompt: true },
+		ui: { rendererId: 'markdown' },
+		prompt: { serializerId: 'asMarkdown' },
+		lifespan: 'infinite',
+		createdTurn: 0,
+		source: 'llm',
+	};
+}
+
+function makeVariant(part: Part): Variant {
+	return {
+		variantId: 'variant_1',
+		entryId: 'entry_1',
+		kind: 'generation',
+		createdAt: Date.UTC(2026, 0, 1),
+		parts: [part],
+	};
+}
+
+function renderPartsView(variant: Variant): string {
+	return renderToStaticMarkup(
+		React.createElement(
+			MantineProvider,
+			{},
+			React.createElement(PartsView, {
+				entry: makeEntry(),
+				variant,
+				currentTurn: 0,
+			}),
+		),
+	);
+}
+
+describe('PartsView', () => {
+	it('keeps markdown rendering enabled while streaming assistant content', () => {
+		const markup = renderPartsView(makeVariant(makeMarkdownPart('Streaming **bold** content')));
+
+		expect(markup).toContain('<strong>bold</strong>');
+		expect(markup).not.toContain('**bold**');
+	});
+});
diff --git a/web/src/features/chat-window/message/parts/parts-view.tsx b/web/src/features/chat-window/message/parts/parts-view.tsx
index d8b3239a..1078b075 100644
--- a/web/src/features/chat-window/message/parts/parts-view.tsx
+++ b/web/src/features/chat-window/message/parts/parts-view.tsx
@@ -17,7 +17,6 @@ type Props = {
 	entry: Entry;
 	variant: Variant | null;
 	currentTurn: number;
-	preferPlainText?: boolean;
 	canMutateParts?: boolean;
 	editingPartId?: string | null;
 	draftText?: string;
@@ -45,7 +44,6 @@ const PartsViewInner: React.FC<Props> = ({
 	entry,
 	variant,
 	currentTurn,
-	preferPlainText = false,
 	canMutateParts = false,
 	editingPartId = null,
 	draftText = '',
@@ -161,7 +159,7 @@ const PartsViewInner: React.FC<Props> = ({
 									/>
 								</>
 							) : (
-								renderPart(p, { plainTextForMarkdown: preferPlainText })
+								renderPart(p)
 							)}
 						</Box>
 					</Box>
@@ -244,7 +242,7 @@ const PartsViewInner: React.FC<Props> = ({
 									{typeof p.replacesPartId === 'string' ? `replaces=${p.replacesPartId}` : ''}
 									{p.softDeleted ? ' softDeleted' : ''}
 								</Text>
-								<Box>{renderPart(p, { plainTextForMarkdown: preferPlainText })}</Box>
+								<Box>{renderPart(p)}</Box>
 							</Box>
 						))}
 					</Stack>
@@ -259,7 +257,6 @@ export const PartsView = memo(PartsViewInner, (prev, next) => {
 		prev.entry === next.entry &&
 		prev.variant === next.variant &&
 		prev.currentTurn === next.currentTurn &&
-		Boolean(prev.preferPlainText) === Boolean(next.preferPlainText) &&
 		Boolean(prev.canMutateParts) === Boolean(next.canMutateParts) &&
 		prev.editingPartId === next.editingPartId &&
 		prev.draftText === next.draftText &&
diff --git a/web/src/features/chat-window/message/parts/renderers.tsx b/web/src/features/chat-window/message/parts/renderers.tsx
index fd66d6e0..8dddec7f 100644
--- a/web/src/features/chat-window/message/parts/renderers.tsx
+++ b/web/src/features/chat-window/message/parts/renderers.tsx
@@ -6,9 +6,6 @@ import type { Part } from '@shared/types/chat-entry-parts';
 import type React from 'react';
 
 export type PartRenderer = React.FC<{ part: Part }>;
-export type RenderPartOptions = {
-	plainTextForMarkdown?: boolean;
-};
 
 function renderTextPart(part: Part): React.ReactNode {
 	const content = typeof part.payload === 'string' ? part.payload : '';
@@ -45,10 +42,9 @@ function renderFallbackPart(part: Part): React.ReactNode {
 	);
 }
 
-export function renderPart(part: Part, options?: RenderPartOptions): React.ReactNode {
+export function renderPart(part: Part): React.ReactNode {
 	const id = part.ui?.rendererId ?? 'markdown';
 	if (id === 'text') return renderTextPart(part);
-	if (id === 'markdown' && options?.plainTextForMarkdown) return renderTextPart(part);
 	if (id === 'markdown') return renderMarkdownPart(part);
 	if (id === 'json') return renderJsonPart(part);
 	if (id === 'card') return renderJsonPart(part);

From 9a4b6d0eb9bf73fbefff5df508597cd3bb0f4b90 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 25 Apr 2026 20:53:54 +0300
Subject: [PATCH 48/54] fix: split message block controls into separate rows

---
 server/src/api/chat-entries.api.ts            |  25 +-
 server/src/api/chat-entries.meta.test.ts      | 114 ++++-
 .../batch-update-entry-parts-plan.ts          | 355 +++++++++++++
 .../batch-update-entry-parts-types.ts         |  86 ++++
 .../chat-runtime/chat-entry-helpers.ts        | 311 +-----------
 .../use-cases/batch-update-entry-parts.ts     |  12 +-
 .../chat-entry-mutation-use-cases.test.ts     |  75 ++-
 .../chat-entry-parts/parts-repository.ts      |  37 +-
 web/src/api/chat-entry-parts.ts               |   9 +-
 .../message/delete-confirm-modal.tsx          |  70 +++
 .../message/entry-parts-editor-modal.tsx      | 353 +++++++++++++
 .../message/entry-parts-editor-state.test.ts  |  77 +++
 .../message/entry-parts-editor-state.ts       | 115 +++++
 .../message/message-action-modals.tsx         | 467 +-----------------
 web/src/i18n/resources/en/chat.ts             |   5 +-
 web/src/i18n/resources/ru/chat.ts             |   5 +-
 16 files changed, 1335 insertions(+), 781 deletions(-)
 create mode 100644 server/src/application/chat-runtime/batch-update-entry-parts-plan.ts
 create mode 100644 server/src/application/chat-runtime/batch-update-entry-parts-types.ts
 create mode 100644 web/src/features/chat-window/message/delete-confirm-modal.tsx
 create mode 100644 web/src/features/chat-window/message/entry-parts-editor-modal.tsx
 create mode 100644 web/src/features/chat-window/message/entry-parts-editor-state.test.ts
 create mode 100644 web/src/features/chat-window/message/entry-parts-editor-state.ts

diff --git a/server/src/api/chat-entries.api.ts b/server/src/api/chat-entries.api.ts
index 4e5edc75..de1a9527 100644
--- a/server/src/api/chat-entries.api.ts
+++ b/server/src/api/chat-entries.api.ts
@@ -402,13 +402,34 @@ const manualEditBodySchema = z.object({
 });
 
 const batchUpdateEntryPartSchema = z.object({
-  partId: z.string().min(1),
-  deleted: z.boolean(),
+  partId: z.string().min(1).optional(),
+  clientPartId: z.string().min(1).optional(),
+  deleted: z.boolean().optional().default(false),
+  channel: z.enum(["main", "reasoning", "aux", "trace"]).optional(),
+  payloadFormat: z.enum(["text", "markdown", "json"]).optional(),
+  label: z.string().min(1).optional(),
   visibility: z.object({
     ui: z.enum(["always", "never"]),
     prompt: z.boolean(),
   }),
   payload: z.unknown(),
+}).superRefine((value, ctx) => {
+  const hasPartId = typeof value.partId === "string";
+  const hasClientPartId = typeof value.clientPartId === "string";
+  if (hasPartId === hasClientPartId) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: "Either partId or clientPartId is required",
+      path: ["partId"],
+    });
+  }
+  if (hasClientPartId && value.deleted) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: "New parts cannot be deleted",
+      path: ["deleted"],
+    });
+  }
 });
 
 const batchUpdateEntryPartsBodySchema = z.object({
diff --git a/server/src/api/chat-entries.meta.test.ts b/server/src/api/chat-entries.meta.test.ts
index 7bac4af9..89c01b17 100644
--- a/server/src/api/chat-entries.meta.test.ts
+++ b/server/src/api/chat-entries.meta.test.ts
@@ -887,7 +887,6 @@ describe("batch update entry parts helpers", () => {
 
     const plan = buildBatchUpdatePartPlan({
       variantParts: parts,
-      nowMs: 100,
       body: {
         variantId: "variant-1",
         mainPartId: "part-alt",
@@ -923,14 +922,14 @@ describe("batch update entry parts helpers", () => {
         expect.objectContaining({
           partId: "part-alt",
           channel: "main",
-          order: 0,
+          order: 10,
           replacesPartId: null,
           payload: "alt edited",
         }),
         expect.objectContaining({
           partId: "part-main",
           channel: "aux",
-          order: 10,
+          order: 0,
           payload: "main edited",
         }),
         expect.objectContaining({
@@ -944,6 +943,115 @@ describe("batch update entry parts helpers", () => {
     );
   });
 
+  test("buildBatchUpdatePartPlan preserves explicit order when main changes", () => {
+    const parts: Part[] = [
+      makePart({ partId: "first", channel: "main", order: 0, payload: "first" }),
+      makePart({ partId: "second", channel: "aux", order: 10, payload: "second" }),
+      makePart({ partId: "third", channel: "aux", order: 20, payload: "third" }),
+    ];
+
+    const plan = buildBatchUpdatePartPlan({
+      variantParts: parts,
+      body: {
+        variantId: "variant-1",
+        mainPartId: "second",
+        orderedPartIds: ["first", "second", "third"],
+        parts: parts.map((part) => ({
+          partId: part.partId,
+          deleted: false,
+          visibility: { ui: "always", prompt: true },
+          payload: part.payload,
+        })),
+      },
+    });
+
+    expect(plan.patches).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ partId: "first", channel: "aux", order: 0 }),
+        expect.objectContaining({ partId: "second", channel: "main", order: 10 }),
+        expect.objectContaining({ partId: "third", channel: "aux", order: 20 }),
+      ])
+    );
+  });
+
+  test("buildBatchUpdatePartPlan separates hard deletes from soft-delete patches", () => {
+    const parts: Part[] = [
+      makePart({ partId: "keep", channel: "main", order: 0, payload: "keep" }),
+      makePart({ partId: "remove", channel: "aux", order: 10, payload: "remove" }),
+    ];
+
+    const plan = buildBatchUpdatePartPlan({
+      variantParts: parts,
+      body: {
+        variantId: "variant-1",
+        mainPartId: "keep",
+        orderedPartIds: ["keep"],
+        parts: [
+          {
+            partId: "keep",
+            deleted: false,
+            visibility: { ui: "always", prompt: true },
+            payload: "keep",
+          },
+          {
+            partId: "remove",
+            deleted: true,
+            visibility: { ui: "always", prompt: true },
+            payload: "remove",
+          },
+        ],
+      },
+    });
+
+    expect(plan.deletedPartIds).toEqual(["remove"]);
+    expect(plan.patches.map((item) => item.partId)).toEqual(["keep"]);
+    expect(plan.patches).not.toContainEqual(expect.objectContaining({ partId: "remove", softDeleted: true }));
+  });
+
+  test("buildBatchUpdatePartPlan creates new user blocks", () => {
+    const parts: Part[] = [
+      makePart({ partId: "existing-main", channel: "main", order: 0, payload: "main" }),
+    ];
+
+    const plan = buildBatchUpdatePartPlan({
+      variantParts: parts,
+      body: {
+        variantId: "variant-1",
+        mainPartId: "new-block",
+        orderedPartIds: ["existing-main", "new-block"],
+        parts: [
+          {
+            partId: "existing-main",
+            deleted: false,
+            visibility: { ui: "always", prompt: true },
+            payload: "main",
+          },
+          {
+            clientPartId: "new-block",
+            channel: "aux",
+            payloadFormat: "markdown",
+            visibility: { ui: "always", prompt: true },
+            payload: "new text",
+          },
+        ],
+      },
+    });
+
+    expect(plan.creates).toEqual([
+      expect.objectContaining({
+        clientPartId: "new-block",
+        channel: "main",
+        order: 10,
+        payload: "new text",
+        payloadFormat: "markdown",
+        source: "user",
+      }),
+    ]);
+    expect(plan.patches).toEqual([
+      expect.objectContaining({ partId: "existing-main", channel: "aux", order: 0 }),
+    ]);
+  });
+
   test("buildBatchUpdatePartPlan rejects non-text main", () => {
     const parts: Part[] = [
       makePart({
diff --git a/server/src/application/chat-runtime/batch-update-entry-parts-plan.ts b/server/src/application/chat-runtime/batch-update-entry-parts-plan.ts
new file mode 100644
index 00000000..de47760f
--- /dev/null
+++ b/server/src/application/chat-runtime/batch-update-entry-parts-plan.ts
@@ -0,0 +1,355 @@
+import { HttpError } from "@core/middleware/error-handler";
+
+import type {
+  BatchUpdateEntryPartPatch,
+  BatchUpdateEntryPartPayload,
+  BatchUpdateEntryPartsBody,
+  BatchUpdatePartCreatePlan,
+  BatchUpdatePartPatchPlan,
+  BatchUpdatePartPlan,
+  ExistingBatchUpdateEntryPartPatch,
+} from "./batch-update-entry-parts-types";
+import type { Entry, Part, PartChannel, PartPayloadFormat, PartVisibility } from "@shared/types/chat-entry-parts";
+
+type PlannedBatchPartState = {
+  refId: string;
+  partId: string | null;
+  clientPartId: string | null;
+  channel: PartChannel;
+  order: number;
+  payload: BatchUpdateEntryPartPayload;
+  payloadFormat: PartPayloadFormat;
+  schemaId?: string;
+  label?: string;
+  visibility: PartVisibility;
+  replacesPartId: string | null;
+  deleted: boolean;
+  createdTurn: number;
+};
+
+function normalizeReplacesPartId(value: unknown): string | null {
+  if (typeof value !== "string") return null;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function assertUniquePartIds(ids: string[], label: string): void {
+  const seen = new Set<string>();
+  for (const id of ids) {
+    if (seen.has(id)) {
+      throw new HttpError(400, `Duplicate ${label} item`, "VALIDATION_ERROR", {
+        partId: id,
+      });
+    }
+    seen.add(id);
+  }
+}
+
+function normalizePayloadByFormat(params: {
+  payloadFormat: PartPayloadFormat;
+  payload: unknown;
+  partId: string;
+}): BatchUpdateEntryPartPayload {
+  if (params.payloadFormat === "text" || params.payloadFormat === "markdown") {
+    if (typeof params.payload !== "string") {
+      throw new HttpError(400, "Text/markdown part payload must be a string", "VALIDATION_ERROR", {
+        partId: params.partId,
+      });
+    }
+    return params.payload;
+  }
+
+  if (params.payloadFormat === "json") {
+    if (
+      params.payload === null ||
+      typeof params.payload === "string" ||
+      typeof params.payload === "number" ||
+      typeof params.payload === "boolean" ||
+      typeof params.payload === "object"
+    ) {
+      return params.payload as BatchUpdateEntryPartPayload;
+    }
+  }
+
+  throw new HttpError(400, "Unsupported payload type for part format", "VALIDATION_ERROR", {
+    partId: params.partId,
+    payloadFormat: params.payloadFormat,
+  });
+}
+
+function isPartDependentOnTarget(params: {
+  refId: string;
+  targetRefId: string;
+  byRefId: Map<string, PlannedBatchPartState>;
+}): boolean {
+  const visited = new Set<string>();
+  let cursor = params.byRefId.get(params.refId)?.replacesPartId ?? null;
+  while (cursor) {
+    if (cursor === params.targetRefId) return true;
+    if (visited.has(cursor)) break;
+    visited.add(cursor);
+    cursor = params.byRefId.get(cursor)?.replacesPartId ?? null;
+  }
+  return false;
+}
+
+function isStringMainPayloadFormat(format: PartPayloadFormat): boolean {
+  return format === "text" || format === "markdown";
+}
+
+function patchRefId(patch: BatchUpdateEntryPartPatch): string {
+  if ("partId" in patch && typeof patch.partId === "string") return patch.partId;
+  return patch.clientPartId;
+}
+
+function isExistingPatch(
+  patch: BatchUpdateEntryPartPatch
+): patch is ExistingBatchUpdateEntryPartPatch {
+  return "partId" in patch && typeof patch.partId === "string";
+}
+
+function normalizeNewPartFormat(format: PartPayloadFormat | undefined): PartPayloadFormat {
+  return format ?? "markdown";
+}
+
+function normalizeNewPartChannel(channel: PartChannel | undefined): PartChannel {
+  return channel ?? "aux";
+}
+
+function defaultUiForFormat(format: PartPayloadFormat): Part["ui"] {
+  return { rendererId: format === "json" ? "json" : format };
+}
+
+function defaultPromptForFormat(format: PartPayloadFormat): Part["prompt"] {
+  if (format === "json") return { serializerId: "asJson" };
+  if (format === "markdown") return { serializerId: "asMarkdown" };
+  return { serializerId: "asText" };
+}
+
+export function assertBatchUpdateVariantIsActive(params: {
+  entry: Entry;
+  requestedVariantId: string;
+}): void {
+  if (params.entry.activeVariantId === params.requestedVariantId) return;
+  throw new HttpError(409, "Variant mismatch: active variant has changed", "CONFLICT", {
+    activeVariantId: params.entry.activeVariantId,
+    requestedVariantId: params.requestedVariantId,
+  });
+}
+
+export function buildBatchUpdatePartPlan(params: {
+  variantParts: Part[];
+  body: BatchUpdateEntryPartsBody;
+}): BatchUpdatePartPlan {
+  const activeParts = (params.variantParts ?? []).filter((part) => !part.softDeleted);
+  if (activeParts.length === 0) {
+    throw new HttpError(400, "No active parts in variant", "VALIDATION_ERROR");
+  }
+
+  const activeById = new Map(activeParts.map((part) => [part.partId, part] as const));
+  const requestedRefIds = params.body.parts.map(patchRefId);
+  assertUniquePartIds(requestedRefIds, "parts");
+
+  const existingPatches = params.body.parts.filter(isExistingPatch);
+  const requestedExistingIds = existingPatches.map((item) => item.partId);
+  for (const partId of requestedExistingIds) {
+    if (!activeById.has(partId)) {
+      throw new HttpError(404, "Part не найден", "NOT_FOUND", { partId });
+    }
+  }
+  if (requestedExistingIds.length !== activeParts.length) {
+    throw new HttpError(400, "Request must include all active variant parts", "VALIDATION_ERROR");
+  }
+
+  const requestPatchByRefId = new Map(params.body.parts.map((item) => [patchRefId(item), item] as const));
+  const plannedByRefId = new Map<string, PlannedBatchPartState>();
+  const createdTurn = activeParts.reduce((max, part) => Math.max(max, part.createdTurn), 0);
+
+  for (const activePart of activeParts) {
+    const patch = requestPatchByRefId.get(activePart.partId);
+    if (!patch || !isExistingPatch(patch)) {
+      throw new HttpError(400, "Missing part in batch update request", "VALIDATION_ERROR", {
+        partId: activePart.partId,
+      });
+    }
+
+    plannedByRefId.set(activePart.partId, {
+      refId: activePart.partId,
+      partId: activePart.partId,
+      clientPartId: null,
+      channel: activePart.channel,
+      order: activePart.order,
+      payload: normalizePayloadByFormat({
+        payloadFormat: activePart.payloadFormat,
+        payload: patch.payload,
+        partId: activePart.partId,
+      }),
+      payloadFormat: activePart.payloadFormat,
+      schemaId: activePart.schemaId,
+      label: activePart.label,
+      visibility: {
+        ui: patch.visibility.ui,
+        prompt: patch.visibility.prompt,
+      },
+      replacesPartId: normalizeReplacesPartId(activePart.replacesPartId),
+      deleted: patch.deleted,
+      createdTurn: activePart.createdTurn,
+    });
+  }
+
+  for (const patch of params.body.parts) {
+    if (isExistingPatch(patch)) continue;
+    const format = normalizeNewPartFormat(patch.payloadFormat);
+    plannedByRefId.set(patch.clientPartId, {
+      refId: patch.clientPartId,
+      partId: null,
+      clientPartId: patch.clientPartId,
+      channel: normalizeNewPartChannel(patch.channel),
+      order: 0,
+      payload: normalizePayloadByFormat({
+        payloadFormat: format,
+        payload: patch.payload,
+        partId: patch.clientPartId,
+      }),
+      payloadFormat: format,
+      label: patch.label,
+      visibility: {
+        ui: patch.visibility.ui,
+        prompt: patch.visibility.prompt,
+      },
+      replacesPartId: null,
+      deleted: false,
+      createdTurn,
+    });
+  }
+
+  const nonDeletedPartIds = Array.from(plannedByRefId.values())
+    .filter((part) => !part.deleted)
+    .map((part) => part.refId);
+  if (nonDeletedPartIds.length === 0) {
+    throw new HttpError(400, "At least one part must remain active", "VALIDATION_ERROR");
+  }
+
+  const mainPart = plannedByRefId.get(params.body.mainPartId);
+  if (!mainPart || mainPart.deleted) {
+    throw new HttpError(400, "mainPartId must reference an active part", "VALIDATION_ERROR", {
+      mainPartId: params.body.mainPartId,
+    });
+  }
+  if (!isStringMainPayloadFormat(mainPart.payloadFormat) || typeof mainPart.payload !== "string") {
+    throw new HttpError(400, "Main part must be text/markdown with string payload", "VALIDATION_ERROR", {
+      mainPartId: params.body.mainPartId,
+    });
+  }
+
+  assertUniquePartIds(params.body.orderedPartIds, "orderedPartIds");
+  const orderedSet = new Set(params.body.orderedPartIds);
+  const nonDeletedSet = new Set(nonDeletedPartIds);
+  if (orderedSet.size !== nonDeletedSet.size) {
+    throw new HttpError(
+      400,
+      "orderedPartIds must match the set of non-deleted parts",
+      "VALIDATION_ERROR"
+    );
+  }
+  for (const partId of orderedSet) {
+    if (!nonDeletedSet.has(partId)) {
+      throw new HttpError(
+        400,
+        "orderedPartIds must match the set of non-deleted parts",
+        "VALIDATION_ERROR",
+        { partId }
+      );
+    }
+  }
+
+  mainPart.channel = "main";
+  mainPart.replacesPartId = null;
+
+  const deletedRefIds = new Set(
+    Array.from(plannedByRefId.values())
+      .filter((part) => part.deleted)
+      .map((part) => part.refId)
+  );
+
+  for (const plannedPart of plannedByRefId.values()) {
+    if (plannedPart.deleted) continue;
+    if (plannedPart.refId !== params.body.mainPartId && plannedPart.channel === "main") {
+      plannedPart.channel = "aux";
+    }
+    if (plannedPart.replacesPartId && deletedRefIds.has(plannedPart.replacesPartId)) {
+      plannedPart.replacesPartId = null;
+    }
+  }
+
+  for (const plannedPart of plannedByRefId.values()) {
+    if (plannedPart.deleted) continue;
+    if (plannedPart.refId === params.body.mainPartId) continue;
+    if (
+      isPartDependentOnTarget({
+        refId: plannedPart.refId,
+        targetRefId: params.body.mainPartId,
+        byRefId: plannedByRefId,
+      })
+    ) {
+      plannedPart.replacesPartId = null;
+    }
+  }
+
+  let nextOrder = 0;
+  for (const partId of params.body.orderedPartIds) {
+    const plannedPart = plannedByRefId.get(partId);
+    if (!plannedPart || plannedPart.deleted) continue;
+    plannedPart.order = nextOrder;
+    nextOrder += 10;
+  }
+
+  const activePlans = Array.from(plannedByRefId.values()).filter((part) => !part.deleted);
+  const patches: BatchUpdatePartPatchPlan[] = activePlans
+    .filter((plannedPart) => plannedPart.partId)
+    .map((plannedPart) => ({
+      partId: plannedPart.partId as string,
+      channel: plannedPart.channel,
+      order: plannedPart.order,
+      payload: plannedPart.payload,
+      payloadFormat: plannedPart.payloadFormat,
+      schemaId: plannedPart.schemaId,
+      label: plannedPart.label,
+      visibility: plannedPart.visibility,
+      replacesPartId: plannedPart.replacesPartId,
+      softDeleted: false,
+      softDeletedAt: null,
+      softDeletedBy: null,
+    }));
+
+  const creates: BatchUpdatePartCreatePlan[] = activePlans
+    .filter((plannedPart) => plannedPart.clientPartId)
+    .map((plannedPart) => ({
+      clientPartId: plannedPart.clientPartId as string,
+      channel: plannedPart.channel,
+      order: plannedPart.order,
+      payload: plannedPart.payload,
+      payloadFormat: plannedPart.payloadFormat,
+      schemaId: plannedPart.schemaId,
+      label: plannedPart.label,
+      visibility: plannedPart.visibility,
+      ui: defaultUiForFormat(plannedPart.payloadFormat),
+      prompt: defaultPromptForFormat(plannedPart.payloadFormat),
+      lifespan: "infinite",
+      createdTurn: plannedPart.createdTurn,
+      source: "user",
+      replacesPartId: plannedPart.replacesPartId,
+    }));
+
+  const deletedPartIds = Array.from(plannedByRefId.values())
+    .filter((item) => item.deleted && item.partId)
+    .map((item) => item.partId as string);
+
+  return {
+    mainPartId: params.body.mainPartId,
+    updatedPartIds: patches.map((item) => item.partId),
+    deletedPartIds,
+    patches,
+    creates,
+  };
+}
diff --git a/server/src/application/chat-runtime/batch-update-entry-parts-types.ts b/server/src/application/chat-runtime/batch-update-entry-parts-types.ts
new file mode 100644
index 00000000..905a3dd4
--- /dev/null
+++ b/server/src/application/chat-runtime/batch-update-entry-parts-types.ts
@@ -0,0 +1,86 @@
+import type {
+  Part,
+  PartChannel,
+  PartLifespan,
+  PartPayloadFormat,
+  PartSource,
+  PartVisibility,
+} from "@shared/types/chat-entry-parts";
+
+export type BatchUpdateEntryPartPayload = string | object | number | boolean | null;
+
+export type ExistingBatchUpdateEntryPartPatch = {
+  partId: string;
+  clientPartId?: never;
+  deleted: boolean;
+  visibility: {
+    ui: "always" | "never";
+    prompt: boolean;
+  };
+  payload: BatchUpdateEntryPartPayload;
+};
+
+export type NewBatchUpdateEntryPartPatch = {
+  partId?: never;
+  clientPartId: string;
+  deleted?: false;
+  channel?: PartChannel;
+  payloadFormat?: PartPayloadFormat;
+  label?: string;
+  visibility: {
+    ui: "always" | "never";
+    prompt: boolean;
+  };
+  payload: BatchUpdateEntryPartPayload;
+};
+
+export type BatchUpdateEntryPartPatch =
+  | ExistingBatchUpdateEntryPartPatch
+  | NewBatchUpdateEntryPartPatch;
+
+export type BatchUpdateEntryPartsBody = {
+  variantId: string;
+  mainPartId: string;
+  orderedPartIds: string[];
+  parts: BatchUpdateEntryPartPatch[];
+};
+
+export type BatchUpdatePartPatchPlan = {
+  partId: string;
+  channel: PartChannel;
+  order: number;
+  payload: BatchUpdateEntryPartPayload;
+  payloadFormat: PartPayloadFormat;
+  schemaId?: string;
+  label?: string;
+  visibility: PartVisibility;
+  replacesPartId: string | null;
+  softDeleted: false;
+  softDeletedAt: null;
+  softDeletedBy: null;
+};
+
+export type BatchUpdatePartCreatePlan = {
+  clientPartId: string;
+  channel: PartChannel;
+  order: number;
+  payload: BatchUpdateEntryPartPayload;
+  payloadFormat: PartPayloadFormat;
+  schemaId?: string;
+  label?: string;
+  visibility: PartVisibility;
+  ui: Part["ui"];
+  prompt: Part["prompt"];
+  lifespan: PartLifespan;
+  createdTurn: number;
+  source: PartSource;
+  replacesPartId: string | null;
+};
+
+export type BatchUpdatePartPlan = {
+  mainPartId: string;
+  updatedPartIds: string[];
+  deletedPartIds: string[];
+  patches: BatchUpdatePartPatchPlan[];
+  creates: BatchUpdatePartCreatePlan[];
+};
diff --git a/server/src/application/chat-runtime/chat-entry-helpers.ts b/server/src/application/chat-runtime/chat-entry-helpers.ts
index feebe3b6..166c49a4 100644
--- a/server/src/application/chat-runtime/chat-entry-helpers.ts
+++ b/server/src/application/chat-runtime/chat-entry-helpers.ts
@@ -4,16 +4,20 @@ import { renderLiquidTemplate } from "../../services/chat-core/prompt-template-r
 import { getUiProjection } from "../../services/chat-entry-parts/projection";
 import { normalizePromptDiagnosticsDebugJson } from "../../services/chat-generation-v3/prompt/generation-debug-payload";
 
+export {
+  assertBatchUpdateVariantIsActive,
+  buildBatchUpdatePartPlan,
+} from "./batch-update-entry-parts-plan";
+export type {
+  BatchUpdateEntryPartPatch,
+  BatchUpdateEntryPartPayload,
+  BatchUpdateEntryPartsBody,
+  BatchUpdatePartPlan,
+} from "./batch-update-entry-parts-types";
+
 import type { GenerationWithDebugDto } from "../../services/chat-core/generations-repository";
 import type { InstructionRenderContext } from "../../services/chat-core/prompt-template-renderer";
-import type {
-  Entry,
-  Part,
-  PartChannel,
-  PartPayloadFormat,
-  PartVisibility,
-  Variant,
-} from "@shared/types/chat-entry-parts";
+import type { Entry, Part, Variant } from "@shared/types/chat-entry-parts";
 
 export type UserPersonaSnapshot = {
   id: string;
@@ -109,58 +113,6 @@ export type LatestWorldInfoActivationsResponse = {
   }>;
 };
 
-export type BatchUpdateEntryPartPayload = string | object | number | boolean | null;
-
-export type BatchUpdateEntryPartPatch = {
-  partId: string;
-  deleted: boolean;
-  visibility: {
-    ui: "always" | "never";
-    prompt: boolean;
-  };
-  payload: BatchUpdateEntryPartPayload;
-};
-
-export type BatchUpdateEntryPartsBody = {
-  variantId: string;
-  mainPartId: string;
-  orderedPartIds: string[];
-  parts: BatchUpdateEntryPartPatch[];
-};
-
-type PlannedBatchPartState = {
-  partId: string;
-  channel: PartChannel;
-  order: number;
-  payload: BatchUpdateEntryPartPayload;
-  payloadFormat: PartPayloadFormat;
-  schemaId?: string;
-  label?: string;
-  visibility: PartVisibility;
-  replacesPartId: string | null;
-  deleted: boolean;
-};
-
-type BatchUpdatePartPlan = {
-  mainPartId: string;
-  updatedPartIds: string[];
-  deletedPartIds: string[];
-  patches: Array<{
-    partId: string;
-    channel: PartChannel;
-    order: number;
-    payload: BatchUpdateEntryPartPayload;
-    payloadFormat: PartPayloadFormat;
-    schemaId?: string;
-    label?: string;
-    visibility: PartVisibility;
-    replacesPartId: string | null;
-    softDeleted: boolean;
-    softDeletedAt: number | null;
-    softDeletedBy: "user" | "agent" | null;
-  }>;
-};
-
 export function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -698,245 +650,6 @@ export function pickPreviousUserEntries(params: {
   return result;
 }
 
-function normalizeReplacesPartId(value: unknown): string | null {
-  if (typeof value !== "string") return null;
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : null;
-}
-
-function assertUniquePartIds(ids: string[], label: string): void {
-  const seen = new Set<string>();
-  for (const id of ids) {
-    if (seen.has(id)) {
-      throw new HttpError(400, `Duplicate ${label} item`, "VALIDATION_ERROR", {
-        partId: id,
-      });
-    }
-    seen.add(id);
-  }
-}
-
-function normalizePayloadByFormat(params: {
-  payloadFormat: PartPayloadFormat;
-  payload: unknown;
-  partId: string;
-}): BatchUpdateEntryPartPayload {
-  if (params.payloadFormat === "text" || params.payloadFormat === "markdown") {
-    if (typeof params.payload !== "string") {
-      throw new HttpError(400, "Text/markdown part payload must be a string", "VALIDATION_ERROR", {
-        partId: params.partId,
-      });
-    }
-    return params.payload;
-  }
-
-  if (params.payloadFormat === "json") {
-    if (
-      params.payload === null ||
-      typeof params.payload === "string" ||
-      typeof params.payload === "number" ||
-      typeof params.payload === "boolean" ||
-      typeof params.payload === "object"
-    ) {
-      return params.payload as BatchUpdateEntryPartPayload;
-    }
-  }
-
-  throw new HttpError(400, "Unsupported payload type for part format", "VALIDATION_ERROR", {
-    partId: params.partId,
-    payloadFormat: params.payloadFormat,
-  });
-}
-
-function isPartDependentOnTarget(params: {
-  partId: string;
-  targetPartId: string;
-  byId: Map<string, PlannedBatchPartState>;
-}): boolean {
-  const visited = new Set<string>();
-  let cursor = params.byId.get(params.partId)?.replacesPartId ?? null;
-  while (cursor) {
-    if (cursor === params.targetPartId) return true;
-    if (visited.has(cursor)) break;
-    visited.add(cursor);
-    cursor = params.byId.get(cursor)?.replacesPartId ?? null;
-  }
-  return false;
-}
-
-function isStringMainPayloadFormat(format: PartPayloadFormat): boolean {
-  return format === "text" || format === "markdown";
-}
-
-export function assertBatchUpdateVariantIsActive(params: {
-  entry: Entry;
-  requestedVariantId: string;
-}): void {
-  if (params.entry.activeVariantId === params.requestedVariantId) return;
-  throw new HttpError(409, "Variant mismatch: active variant has changed", "CONFLICT", {
-    activeVariantId: params.entry.activeVariantId,
-    requestedVariantId: params.requestedVariantId,
-  });
-}
-
-export function buildBatchUpdatePartPlan(params: {
-  variantParts: Part[];
-  body: BatchUpdateEntryPartsBody;
-  nowMs?: number;
-}): BatchUpdatePartPlan {
-  const activeParts = (params.variantParts ?? []).filter((part) => !part.softDeleted);
-  if (activeParts.length === 0) {
-    throw new HttpError(400, "No active parts in variant", "VALIDATION_ERROR");
-  }
-
-  const activeById = new Map(activeParts.map((part) => [part.partId, part] as const));
-  const requestedPartIds = params.body.parts.map((item) => item.partId);
-  assertUniquePartIds(requestedPartIds, "parts");
-
-  for (const partId of requestedPartIds) {
-    if (!activeById.has(partId)) {
-      throw new HttpError(404, "Part не найден", "NOT_FOUND", { partId });
-    }
-  }
-  if (requestedPartIds.length !== activeParts.length) {
-    throw new HttpError(400, "Request must include all active variant parts", "VALIDATION_ERROR");
-  }
-
-  const requestPatchById = new Map(params.body.parts.map((item) => [item.partId, item] as const));
-  const plannedById = new Map<string, PlannedBatchPartState>();
-
-  for (const activePart of activeParts) {
-    const patch = requestPatchById.get(activePart.partId);
-    if (!patch) {
-      throw new HttpError(400, "Missing part in batch update request", "VALIDATION_ERROR", {
-        partId: activePart.partId,
-      });
-    }
-
-    plannedById.set(activePart.partId, {
-      partId: activePart.partId,
-      channel: activePart.channel,
-      order: activePart.order,
-      payload: normalizePayloadByFormat({
-        payloadFormat: activePart.payloadFormat,
-        payload: patch.payload,
-        partId: activePart.partId,
-      }),
-      payloadFormat: activePart.payloadFormat,
-      schemaId: activePart.schemaId,
-      label: activePart.label,
-      visibility: {
-        ui: patch.visibility.ui,
-        prompt: patch.visibility.prompt,
-      },
-      replacesPartId: normalizeReplacesPartId(activePart.replacesPartId),
-      deleted: patch.deleted,
-    });
-  }
-
-  const nonDeletedPartIds = Array.from(plannedById.values())
-    .filter((part) => !part.deleted)
-    .map((part) => part.partId);
-  if (nonDeletedPartIds.length === 0) {
-    throw new HttpError(400, "At least one part must remain active", "VALIDATION_ERROR");
-  }
-
-  const mainPart = plannedById.get(params.body.mainPartId);
-  if (!mainPart || mainPart.deleted) {
-    throw new HttpError(400, "mainPartId must reference an active part", "VALIDATION_ERROR", {
-      mainPartId: params.body.mainPartId,
-    });
-  }
-  if (!isStringMainPayloadFormat(mainPart.payloadFormat) || typeof mainPart.payload !== "string") {
-    throw new HttpError(400, "Main part must be text/markdown with string payload", "VALIDATION_ERROR", {
-      mainPartId: params.body.mainPartId,
-    });
-  }
-
-  assertUniquePartIds(params.body.orderedPartIds, "orderedPartIds");
-  const orderedSet = new Set(params.body.orderedPartIds);
-  const nonDeletedSet = new Set(nonDeletedPartIds);
-  if (orderedSet.size !== nonDeletedSet.size) {
-    throw new HttpError(
-      400,
-      "orderedPartIds must match the set of non-deleted parts",
-      "VALIDATION_ERROR"
-    );
-  }
-  for (const partId of orderedSet) {
-    if (!nonDeletedSet.has(partId)) {
-      throw new HttpError(
-        400,
-        "orderedPartIds must match the set of non-deleted parts",
-        "VALIDATION_ERROR",
-        { partId }
-      );
-    }
-  }
-
-  mainPart.channel = "main";
-  mainPart.replacesPartId = null;
-
-  for (const plannedPart of plannedById.values()) {
-    if (plannedPart.deleted) continue;
-    if (plannedPart.partId === params.body.mainPartId) continue;
-    if (plannedPart.channel === "main") plannedPart.channel = "aux";
-  }
-
-  for (const plannedPart of plannedById.values()) {
-    if (plannedPart.deleted) continue;
-    if (plannedPart.partId === params.body.mainPartId) continue;
-    if (
-      isPartDependentOnTarget({
-        partId: plannedPart.partId,
-        targetPartId: params.body.mainPartId,
-        byId: plannedById,
-      })
-    ) {
-      plannedPart.replacesPartId = null;
-    }
-  }
-
-  mainPart.order = 0;
-  let nextOrder = 10;
-  for (const partId of params.body.orderedPartIds) {
-    if (partId === params.body.mainPartId) continue;
-    const plannedPart = plannedById.get(partId);
-    if (!plannedPart || plannedPart.deleted) continue;
-    plannedPart.order = nextOrder;
-    nextOrder += 10;
-  }
-
-  const nowMs =
-    typeof params.nowMs === "number" && Number.isFinite(params.nowMs)
-      ? Math.max(0, Math.floor(params.nowMs))
-      : Date.now();
-
-  const patches = Array.from(plannedById.values()).map((plannedPart) => ({
-    partId: plannedPart.partId,
-    channel: plannedPart.channel,
-    order: plannedPart.order,
-    payload: plannedPart.payload,
-    payloadFormat: plannedPart.payloadFormat,
-    schemaId: plannedPart.schemaId,
-    label: plannedPart.label,
-    visibility: plannedPart.visibility,
-    replacesPartId: plannedPart.replacesPartId,
-    softDeleted: plannedPart.deleted,
-    softDeletedAt: plannedPart.deleted ? nowMs : null,
-    softDeletedBy: plannedPart.deleted ? ("user" as const) : null,
-  }));
-
-  const deletedPartIds = patches.filter((item) => item.softDeleted).map((item) => item.partId);
-
-  return {
-    mainPartId: params.body.mainPartId,
-    updatedPartIds: patches.map((item) => item.partId),
-    deletedPartIds,
-    patches,
-  };
-}
-
 export function isCanonicalizationPart(part: Part): boolean {
   if (part.channel !== "main") return false;
   if (part.source !== "agent") return false;
diff --git a/server/src/application/chat-runtime/use-cases/batch-update-entry-parts.ts b/server/src/application/chat-runtime/use-cases/batch-update-entry-parts.ts
index 08274021..8137666c 100644
--- a/server/src/application/chat-runtime/use-cases/batch-update-entry-parts.ts
+++ b/server/src/application/chat-runtime/use-cases/batch-update-entry-parts.ts
@@ -19,6 +19,7 @@ export type BatchUpdateEntryPartsResult = {
   mainPartId: string;
   updatedPartIds: string[];
   deletedPartIds: string[];
+  createdParts: Array<{ clientPartId: string; partId: string }>;
 };
 
 export async function batchUpdateEntryParts(
@@ -40,19 +41,24 @@ export async function batchUpdateEntryParts(
   const plan = buildBatchUpdatePartPlan({
     variantParts: activeVariant.parts ?? [],
     body: params.body,
-    nowMs: Date.now(),
   });
 
-  await applyPartMutableBatchPatches({
+  const applyResult = await applyPartMutableBatchPatches({
     variantId: activeVariant.variantId,
     patches: plan.patches,
+    creates: plan.creates,
+    deletePartIds: plan.deletedPartIds,
   });
+  const createdPartIdByClientId = new Map(
+    applyResult.createdParts.map((item) => [item.clientPartId, item.partId] as const)
+  );
 
   return {
     entryId: entry.entryId,
     variantId: activeVariant.variantId,
-    mainPartId: plan.mainPartId,
+    mainPartId: createdPartIdByClientId.get(plan.mainPartId) ?? plan.mainPartId,
     updatedPartIds: plan.updatedPartIds,
     deletedPartIds: plan.deletedPartIds,
+    createdParts: applyResult.createdParts,
   };
 }
diff --git a/server/src/application/chat-runtime/use-cases/chat-entry-mutation-use-cases.test.ts b/server/src/application/chat-runtime/use-cases/chat-entry-mutation-use-cases.test.ts
index 64cdb188..4f3e426b 100644
--- a/server/src/application/chat-runtime/use-cases/chat-entry-mutation-use-cases.test.ts
+++ b/server/src/application/chat-runtime/use-cases/chat-entry-mutation-use-cases.test.ts
@@ -372,8 +372,9 @@ describe("chat entry mutation use cases", () => {
       entryId: entry.entry.entryId,
       variantId: entry.variant.variantId,
       mainPartId: auxPart.partId,
-      updatedPartIds: expect.arrayContaining([mainPart.partId, auxPart.partId, deletePart.partId]),
+      updatedPartIds: expect.arrayContaining([mainPart.partId, auxPart.partId]),
       deletedPartIds: [deletePart.partId],
+      createdParts: [],
     });
 
     const refreshedEntry = await getEntryById({ entryId: entry.entry.entryId });
@@ -394,9 +395,75 @@ describe("chat entry mutation use cases", () => {
       payload: "Old main moved",
       softDeleted: false,
     });
-    expect(refreshedParts.get(deletePart.partId)).toMatchObject({
-      softDeleted: true,
-      softDeletedBy: "user",
+    expect(refreshedParts.get(deletePart.partId)).toBeUndefined();
+  });
+
+  test("batchUpdateEntryParts creates new blocks", async () => {
+    const fixture = await seedChatFixture();
+    const entry = await createEntry({
+      chatId: fixture.chatId,
+      branchId: fixture.branchId,
+      role: "assistant",
+    });
+    const mainPart = await createTextPart({
+      variantId: entry.variant.variantId,
+      payload: "Main",
+      channel: "main",
+      order: 0,
+    });
+
+    const result = await batchUpdateEntryParts({
+      entryId: entry.entry.entryId,
+      body: {
+        variantId: entry.variant.variantId,
+        mainPartId: "client-new-main",
+        orderedPartIds: [mainPart.partId, "client-new-main"],
+        parts: [
+          {
+            partId: mainPart.partId,
+            deleted: false,
+            visibility: { ui: "always", prompt: true },
+            payload: "Main moved",
+          },
+          {
+            clientPartId: "client-new-main",
+            channel: "aux",
+            payloadFormat: "markdown",
+            visibility: { ui: "always", prompt: true },
+            payload: "Created main",
+          },
+        ],
+      },
+    });
+
+    const createdPartId = result.createdParts[0]?.partId;
+    expect(result).toEqual({
+      entryId: entry.entry.entryId,
+      variantId: entry.variant.variantId,
+      mainPartId: createdPartId,
+      updatedPartIds: [mainPart.partId],
+      deletedPartIds: [],
+      createdParts: [{ clientPartId: "client-new-main", partId: createdPartId }],
+    });
+
+    const refreshedEntry = await getEntryById({ entryId: entry.entry.entryId });
+    const refreshedVariant = refreshedEntry
+      ? await getActiveVariantWithParts({ entry: refreshedEntry })
+      : null;
+    const refreshedParts = new Map((refreshedVariant?.parts ?? []).map((part) => [part.partId, part] as const));
+
+    expect(refreshedParts.get(mainPart.partId)).toMatchObject({
+      channel: "aux",
+      order: 0,
+      payload: "Main moved",
+    });
+    expect(createdPartId).toBeTruthy();
+    expect(refreshedParts.get(createdPartId ?? "")).toMatchObject({
+      channel: "main",
+      order: 10,
+      payload: "Created main",
+      payloadFormat: "markdown",
+      source: "user",
     });
   });
 
diff --git a/server/src/services/chat-entry-parts/parts-repository.ts b/server/src/services/chat-entry-parts/parts-repository.ts
index 0da54d7d..a925c167 100644
--- a/server/src/services/chat-entry-parts/parts-repository.ts
+++ b/server/src/services/chat-entry-parts/parts-repository.ts
@@ -81,7 +81,7 @@ export async function listPartsForVariants(params: {
   return map;
 }
 
-type CreatePartParams = {
+export type CreatePartParams = {
   ownerId?: string;
   variantId: string;
   channel: PartChannel;
@@ -99,7 +99,7 @@ type CreatePartParams = {
   agentId?: string;
   model?: string;
   requestId?: string;
-  replacesPartId?: string;
+  replacesPartId?: string | null;
   tags?: string[];
   executor?: DbExecutor;
 };
@@ -167,7 +167,7 @@ export function createPart(params: CreatePartParams): Promise<Part> | Part {
         agentId: params.agentId,
         model: params.model,
         requestId: params.requestId,
-        replacesPartId: params.replacesPartId,
+        replacesPartId: params.replacesPartId ?? undefined,
         softDeleted: false,
         tags: params.tags,
       };
@@ -386,13 +386,31 @@ export type PartMutableBatchPatch = {
   softDeletedBy?: "user" | "agent" | null;
 };
 
+export type PartMutableBatchCreate = Omit<CreatePartParams, "executor" | "ownerId" | "variantId"> & {
+  clientPartId: string;
+};
+
+export type PartMutableBatchApplyResult = {
+  createdParts: Array<{ clientPartId: string; partId: string }>;
+};
+
 export async function applyPartMutableBatchPatches(params: {
   variantId: string;
   patches: PartMutableBatchPatch[];
-}): Promise<void> {
+  creates?: PartMutableBatchCreate[];
+  deletePartIds?: string[];
+}): Promise<PartMutableBatchApplyResult> {
   const db = await initDb();
+  const createdParts: Array<{ clientPartId: string; partId: string }> = [];
 
   await db.transaction((tx) => {
+    for (const partId of params.deletePartIds ?? []) {
+      tx
+        .delete(variantParts)
+        .where(and(eq(variantParts.partId, partId), eq(variantParts.variantId, params.variantId)))
+        .run();
+    }
+
     for (const patch of params.patches) {
       tx
         .update(variantParts)
@@ -422,6 +440,17 @@ export async function applyPartMutableBatchPatches(params: {
         )
         .run();
     }
+
+    for (const create of params.creates ?? []) {
+      const created = createPart({
+        ...create,
+        variantId: params.variantId,
+        executor: tx,
+      });
+      createdParts.push({ clientPartId: create.clientPartId, partId: created.partId });
+    }
   });
+
+  return { createdParts };
 }
 
diff --git a/web/src/api/chat-entry-parts.ts b/web/src/api/chat-entry-parts.ts
index 9969fde0..897f919e 100644
--- a/web/src/api/chat-entry-parts.ts
+++ b/web/src/api/chat-entry-parts.ts
@@ -368,8 +368,12 @@ export type BatchUpdateEntryPartsRequest = {
 	mainPartId: string;
 	orderedPartIds: string[];
 	parts: Array<{
-		partId: string;
-		deleted: boolean;
+		partId?: string;
+		clientPartId?: string;
+		deleted?: boolean;
+		channel?: 'main' | 'reasoning' | 'aux' | 'trace';
+		payloadFormat?: 'text' | 'markdown' | 'json';
+		label?: string;
 		visibility: { ui: 'always' | 'never'; prompt: boolean };
 		payload: string | object | number | boolean | null;
 	}>;
@@ -381,6 +385,7 @@ export type BatchUpdateEntryPartsResponse = {
 	mainPartId: string;
 	updatedPartIds: string[];
 	deletedPartIds: string[];
+	createdParts: Array<{ clientPartId: string; partId: string }>;
 };
 
 export async function batchUpdateEntryParts(
diff --git a/web/src/features/chat-window/message/delete-confirm-modal.tsx b/web/src/features/chat-window/message/delete-confirm-modal.tsx
new file mode 100644
index 00000000..66489087
--- /dev/null
+++ b/web/src/features/chat-window/message/delete-confirm-modal.tsx
@@ -0,0 +1,70 @@
+import { Button, Group, Modal, Stack, Text } from '@mantine/core';
+import { useUnit } from 'effector-react';
+import { useTranslation } from 'react-i18next';
+
+import {
+	$deleteConfirmState,
+	closeDeleteConfirm,
+	confirmDeleteAction,
+	deleteVariantFx,
+	softDeleteEntriesBulkFx,
+	softDeleteEntryFx,
+	softDeletePartFx,
+} from '@model/chat-entry-parts';
+
+export const DeleteConfirmModal = () => {
+	const { t } = useTranslation();
+	const [deleteState, closeDelete, confirmDelete, deleteEntryPending, deleteVariantPending, deletePartPending, deleteBulkPending] = useUnit([
+		$deleteConfirmState,
+		closeDeleteConfirm,
+		confirmDeleteAction,
+		softDeleteEntryFx.pending,
+		deleteVariantFx.pending,
+		softDeletePartFx.pending,
+		softDeleteEntriesBulkFx.pending,
+	]);
+
+	if (!deleteState) return null;
+
+	const deleteBusy =
+		deleteState.kind === 'entry'
+			? deleteEntryPending
+			: deleteState.kind === 'variant'
+				? deleteVariantPending
+				: deleteState.kind === 'part'
+					? deletePartPending
+					: deleteBulkPending;
+
+	const deleteTitle =
+		deleteState.kind === 'entry'
+			? t('chat.confirm.deleteMessageTitle')
+			: deleteState.kind === 'variant'
+				? t('chat.confirm.deleteVariantTitle')
+				: deleteState.kind === 'part'
+					? t('chat.confirm.deletePartTitle')
+					: t('chat.confirm.deleteBulkMessagesTitle');
+	const deleteBody =
+		deleteState.kind === 'entry'
+			? t('chat.confirm.deleteMessageBody')
+			: deleteState.kind === 'variant'
+				? t('chat.confirm.deleteVariantBody')
+				: deleteState.kind === 'part'
+					? t('chat.confirm.deletePartBody')
+					: t('chat.confirm.deleteBulkMessagesBody', { count: deleteState.count });
+
+	return (
+		<Modal opened onClose={() => closeDelete()} title={deleteTitle} centered closeOnClickOutside={!deleteBusy} closeOnEscape={!deleteBusy}>
+			<Stack gap="md">
+				<Text size="sm">{deleteBody}</Text>
+				<Group justify="flex-end">
+					<Button variant="subtle" onClick={() => closeDelete()} disabled={deleteBusy}>
+						{t('common.cancel')}
+					</Button>
+					<Button color="red" onClick={() => confirmDelete()} loading={deleteBusy}>
+						{t('common.delete')}
+					</Button>
+				</Group>
+			</Stack>
+		</Modal>
+	);
+};
diff --git a/web/src/features/chat-window/message/entry-parts-editor-modal.tsx b/web/src/features/chat-window/message/entry-parts-editor-modal.tsx
new file mode 100644
index 00000000..c557a46e
--- /dev/null
+++ b/web/src/features/chat-window/message/entry-parts-editor-modal.tsx
@@ -0,0 +1,353 @@
+import { ActionIcon, Alert, Button, Group, Modal, Paper, ScrollArea, Select, Stack, Switch, Text, Textarea } from '@mantine/core';
+import { useUnit } from 'effector-react';
+import { useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { LuArrowDown, LuArrowUp, LuPlus, LuStar, LuTrash } from 'react-icons/lu';
+
+import {
+	$entries,
+	$entryPartsEditorState,
+	batchUpdateEntryPartsFx,
+	closeEntryPartsEditorRequested,
+	saveEntryPartsEditorRequested,
+} from '@model/chat-entry-parts';
+
+import {
+	buildEntryPartsEditorRequestParts,
+	createDraftPartFromSource,
+	createNewDraftPart,
+	isTextLikeDraftPart,
+	resolveFallbackMainPartId,
+	sortPartsStable,
+	type DraftPartState,
+} from './entry-parts-editor-state';
+
+import type { Part } from '@shared/types/chat-entry-parts';
+
+const CHANNEL_OPTIONS: Array<{ value: Part['channel']; label: string }> = [
+	{ value: 'aux', label: 'aux' },
+	{ value: 'reasoning', label: 'reasoning' },
+	{ value: 'trace', label: 'trace' },
+];
+
+const FORMAT_OPTIONS: Array<{ value: Part['payloadFormat']; label: string }> = [
+	{ value: 'markdown', label: 'markdown' },
+	{ value: 'text', label: 'text' },
+	{ value: 'json', label: 'json' },
+];
+
+export const EntryPartsEditorModal = () => {
+	const { t } = useTranslation();
+	const [entries, entryPartsEditorState, closeEntryPartsEditor, saveEntryPartsEditor, partsEditorSaving] = useUnit([
+		$entries,
+		$entryPartsEditorState,
+		closeEntryPartsEditorRequested,
+		saveEntryPartsEditorRequested,
+		batchUpdateEntryPartsFx.pending,
+	]);
+	const [draftParts, setDraftParts] = useState<DraftPartState[]>([]);
+	const [removedPartIds, setRemovedPartIds] = useState<string[]>([]);
+	const [mainPartId, setMainPartId] = useState<string>('');
+
+	const editedEntry = useMemo(() => {
+		if (!entryPartsEditorState.entryId) return null;
+		return entries.find((item) => item.entry.entryId === entryPartsEditorState.entryId) ?? null;
+	}, [entries, entryPartsEditorState.entryId]);
+	const sourceParts = useMemo(
+		() =>
+			(editedEntry?.variant?.parts ?? [])
+				.filter((part) => !part.softDeleted)
+				.slice()
+				.sort(sortPartsStable),
+		[editedEntry?.variant?.parts],
+	);
+	const sourcePartById = useMemo(() => new Map(sourceParts.map((part) => [part.partId, part] as const)), [sourceParts]);
+	const removedParts = useMemo(
+		() => removedPartIds.map((partId) => sourcePartById.get(partId)).filter((part): part is Part => Boolean(part)),
+		[removedPartIds, sourcePartById],
+	);
+
+	useEffect(() => {
+		if (!entryPartsEditorState.open) return;
+		const nextDraft = sourceParts.map(createDraftPartFromSource);
+		setDraftParts(nextDraft);
+		setRemovedPartIds([]);
+		const fallbackMain =
+			nextDraft.find((part) => part.channel === 'main' && isTextLikeDraftPart(part)) ??
+			nextDraft.find(isTextLikeDraftPart) ??
+			nextDraft[0] ??
+			null;
+		setMainPartId(fallbackMain?.id ?? '');
+	}, [entryPartsEditorState.open, sourceParts]);
+
+	const jsonInvalidPartIds = useMemo(() => {
+		const invalid = new Set<string>();
+		for (const part of draftParts) {
+			if (part.payloadFormat !== 'json') continue;
+			try {
+				JSON.parse(part.payloadRaw);
+			} catch {
+				invalid.add(part.id);
+			}
+		}
+		return invalid;
+	}, [draftParts]);
+	const mainDraftPart = useMemo(() => draftParts.find((part) => part.id === mainPartId) ?? null, [draftParts, mainPartId]);
+	const mainPartValid = Boolean(mainDraftPart && isTextLikeDraftPart(mainDraftPart));
+	const canSavePartsEditor =
+		entryPartsEditorState.open &&
+		Boolean(editedEntry?.variant) &&
+		draftParts.length > 0 &&
+		mainPartValid &&
+		jsonInvalidPartIds.size === 0 &&
+		!partsEditorSaving;
+
+	const updateDraftPart = (partId: string, updater: (part: DraftPartState) => DraftPartState) => {
+		setDraftParts((prev) => prev.map((part) => (part.id === partId ? updater(part) : part)));
+	};
+
+	const movePart = (partId: string, direction: 'up' | 'down') => {
+		setDraftParts((prev) => {
+			const fromIndex = prev.findIndex((part) => part.id === partId);
+			if (fromIndex < 0) return prev;
+			if (direction === 'up' && fromIndex === 0) return prev;
+			if (direction === 'down' && fromIndex === prev.length - 1) return prev;
+			const targetIndex = direction === 'up' ? fromIndex - 1 : fromIndex + 1;
+			const next = prev.slice();
+			const tmp = next[targetIndex];
+			next[targetIndex] = next[fromIndex] as DraftPartState;
+			next[fromIndex] = tmp as DraftPartState;
+			return next;
+		});
+	};
+
+	const removePart = (partId: string) => {
+		setDraftParts((prev) => {
+			const next = prev.filter((part) => part.id !== partId);
+			if (mainPartId === partId) setMainPartId(resolveFallbackMainPartId(next));
+			return next;
+		});
+		if (sourcePartById.has(partId)) {
+			setRemovedPartIds((prev) => (prev.includes(partId) ? prev : [...prev, partId]));
+		}
+	};
+
+	const addPart = () => {
+		setDraftParts((prev) => {
+			const nextPart = createNewDraftPart(prev.length + 1);
+			if (prev.length === 0) setMainPartId(nextPart.id);
+			return [...prev, nextPart];
+		});
+	};
+
+	const savePartsEditorChanges = () => {
+		if (!editedEntry?.variant) return;
+		if (!canSavePartsEditor) return;
+		try {
+			saveEntryPartsEditor({
+				entryId: editedEntry.entry.entryId,
+				variantId: editedEntry.variant.variantId,
+				mainPartId,
+				orderedPartIds: draftParts.map((part) => part.id),
+				parts: buildEntryPartsEditorRequestParts({ draftParts, removedParts }),
+			});
+		} catch {
+			return;
+		}
+	};
+
+	return (
+		<Modal
+			opened={entryPartsEditorState.open}
+			onClose={() => {
+				if (partsEditorSaving) return;
+				closeEntryPartsEditor();
+			}}
+			title={t('chat.partsEditor.title')}
+			centered
+			size="xl"
+			closeOnClickOutside={!partsEditorSaving}
+			closeOnEscape={!partsEditorSaving}
+		>
+			<Stack gap="sm">
+				{!editedEntry?.variant && (
+					<Text size="sm" c="dimmed">
+						{t('chat.partsEditor.empty')}
+					</Text>
+				)}
+				{editedEntry?.variant && (
+					<>
+						{draftParts.length === 0 && (
+							<Alert color="red" variant="light">
+								{t('chat.partsEditor.validation.noParts')}
+							</Alert>
+						)}
+						{!mainPartValid && (
+							<Alert color="red" variant="light">
+								{t('chat.partsEditor.validation.mainPart')}
+							</Alert>
+						)}
+						{jsonInvalidPartIds.size > 0 && (
+							<Alert color="red" variant="light">
+								{t('chat.partsEditor.validation.json')}
+							</Alert>
+						)}
+						<Group justify="flex-end">
+							<Button size="xs" variant="light" leftSection={<LuPlus size={14} />} onClick={addPart}>
+								{t('chat.partsEditor.actions.addPart')}
+							</Button>
+						</Group>
+						<ScrollArea.Autosize mah={460}>
+							<Stack gap="xs">
+								{draftParts.map((part, index) => {
+									const isMain = part.id === mainPartId;
+									const canSelectAsMain = isTextLikeDraftPart(part);
+									const isJsonInvalid = part.payloadFormat === 'json' && jsonInvalidPartIds.has(part.id);
+									return (
+										<Paper key={part.id} withBorder radius="sm" p="sm">
+											<Stack gap="xs">
+												<Group justify="space-between" align="flex-start" wrap="nowrap">
+													<Stack gap={0}>
+														<Text size="sm" fw={600}>
+															{part.partId ?? part.clientPartId}
+														</Text>
+														<Text size="xs" c="dimmed">
+															{t('chat.partsEditor.meta.source')}: {part.source}
+														</Text>
+														{part.replacesPartId && (
+															<Text size="xs" c="dimmed">
+																{t('chat.partsEditor.meta.replaces')}: {part.replacesPartId}
+															</Text>
+														)}
+													</Stack>
+													<Group gap={6} align="center" wrap="nowrap">
+														<ActionIcon
+															variant="subtle"
+															onClick={() => movePart(part.id, 'up')}
+															disabled={index <= 0}
+															aria-label={t('chat.partsEditor.actions.moveUp')}
+														>
+															<LuArrowUp size={14} />
+														</ActionIcon>
+														<ActionIcon
+															variant="subtle"
+															onClick={() => movePart(part.id, 'down')}
+															disabled={index >= draftParts.length - 1}
+															aria-label={t('chat.partsEditor.actions.moveDown')}
+														>
+															<LuArrowDown size={14} />
+														</ActionIcon>
+														<Button
+															size="xs"
+															variant={isMain ? 'filled' : 'light'}
+															color={isMain ? 'yellow' : 'gray'}
+															leftSection={<LuStar size={12} />}
+															disabled={!canSelectAsMain}
+															onClick={() => setMainPartId(part.id)}
+														>
+															{isMain ? t('chat.partsEditor.actions.mainSelected') : t('chat.partsEditor.actions.makeMain')}
+														</Button>
+														<ActionIcon
+															variant="subtle"
+															color="red"
+															onClick={() => removePart(part.id)}
+															aria-label={t('chat.partsEditor.actions.removePart')}
+														>
+															<LuTrash size={14} />
+														</ActionIcon>
+													</Group>
+												</Group>
+												<Stack gap="xs">
+													<Group gap="md" wrap="wrap" align="flex-end">
+														<Select
+															size="xs"
+															label={t('chat.partsEditor.fields.channel')}
+															data={CHANNEL_OPTIONS}
+															value={part.channel === 'main' ? 'aux' : part.channel}
+															disabled={Boolean(part.partId)}
+															style={{ flex: '1 1 180px', maxWidth: 240 }}
+															onChange={(value) => {
+																if (!value) return;
+																updateDraftPart(part.id, (prev) => ({ ...prev, channel: value as Part['channel'] }));
+															}}
+														/>
+														<Select
+															size="xs"
+															label={t('chat.partsEditor.fields.format')}
+															data={FORMAT_OPTIONS}
+															value={part.payloadFormat}
+															disabled={Boolean(part.partId)}
+															style={{ flex: '1 1 180px', maxWidth: 240 }}
+															onChange={(value) => {
+																if (!value) return;
+																updateDraftPart(part.id, (prev) => ({ ...prev, payloadFormat: value as Part['payloadFormat'] }));
+															}}
+														/>
+													</Group>
+													<Group gap="xl" wrap="wrap" align="center">
+														<Switch
+															checked={part.visibilityUi === 'always'}
+															label={t('chat.partsEditor.fields.showInUi')}
+															onChange={(event) => {
+																const checked = event.currentTarget.checked;
+																updateDraftPart(part.id, (prev) => ({
+																	...prev,
+																	visibilityUi: checked ? 'always' : 'never',
+																}));
+															}}
+														/>
+														<Switch
+															checked={part.visibilityPrompt}
+															label={t('chat.partsEditor.fields.includeInPrompt')}
+															onChange={(event) => {
+																const checked = event.currentTarget.checked;
+																updateDraftPart(part.id, (prev) => ({
+																	...prev,
+																	visibilityPrompt: checked,
+																}));
+															}}
+														/>
+													</Group>
+												</Stack>
+												<Textarea
+													label={
+														part.payloadFormat === 'json'
+															? t('chat.partsEditor.fields.payloadJson')
+															: t('chat.partsEditor.fields.payloadText')
+													}
+													value={part.payloadRaw}
+													minRows={part.payloadFormat === 'json' ? 5 : 3}
+													autosize
+													onChange={(event) => {
+														const value = event.currentTarget.value;
+														updateDraftPart(part.id, (prev) => ({
+															...prev,
+															payloadRaw: value,
+														}));
+													}}
+												/>
+												{isJsonInvalid && (
+													<Text size="xs" c="red">
+														{t('chat.partsEditor.validation.jsonPart', { partId: part.id })}
+													</Text>
+												)}
+											</Stack>
+										</Paper>
+									);
+								})}
+							</Stack>
+						</ScrollArea.Autosize>
+						<Group justify="flex-end">
+							<Button variant="subtle" disabled={partsEditorSaving} onClick={() => closeEntryPartsEditor()}>
+								{t('common.cancel')}
+							</Button>
+							<Button onClick={savePartsEditorChanges} loading={partsEditorSaving} disabled={!canSavePartsEditor}>
+								{t('common.save')}
+							</Button>
+						</Group>
+					</>
+				)}
+			</Stack>
+		</Modal>
+	);
+};
diff --git a/web/src/features/chat-window/message/entry-parts-editor-state.test.ts b/web/src/features/chat-window/message/entry-parts-editor-state.test.ts
new file mode 100644
index 00000000..a14473cf
--- /dev/null
+++ b/web/src/features/chat-window/message/entry-parts-editor-state.test.ts
@@ -0,0 +1,77 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+	buildEntryPartsEditorRequestParts,
+	createDraftPartFromSource,
+	resolveFallbackMainPartId,
+} from './entry-parts-editor-state';
+
+import type { Part } from '@shared/types/chat-entry-parts';
+
+function makePart(params: Partial<Part> & Pick<Part, 'partId'>): Part {
+	return {
+		partId: params.partId,
+		channel: params.channel ?? 'aux',
+		order: params.order ?? 0,
+		payload: params.payload ?? '',
+		payloadFormat: params.payloadFormat ?? 'markdown',
+		visibility: params.visibility ?? { ui: 'always', prompt: true },
+		ui: { rendererId: 'markdown' },
+		prompt: { serializerId: 'asMarkdown' },
+		lifespan: 'infinite',
+		createdTurn: 1,
+		source: params.source ?? 'user',
+	};
+}
+
+describe('entry parts editor state', () => {
+	it('builds hard-delete request entries for removed source parts', () => {
+		const keep = createDraftPartFromSource(makePart({ partId: 'keep', channel: 'main', payload: 'keep' }));
+		const remove = makePart({ partId: 'remove', channel: 'aux', payload: 'remove' });
+
+		const requestParts = buildEntryPartsEditorRequestParts({
+			draftParts: [keep],
+			removedParts: [remove],
+		});
+
+		expect(requestParts).toEqual([
+			expect.objectContaining({ partId: 'keep', deleted: false }),
+			expect.objectContaining({ partId: 'remove', deleted: true, payload: 'remove' }),
+		]);
+	});
+
+	it('keeps new block identity and format in save payload', () => {
+		const newPart = {
+			id: 'new-block',
+			clientPartId: 'new-block',
+			channel: 'aux' as const,
+			payloadFormat: 'json' as const,
+			source: 'user' as const,
+			replacesPartId: null,
+			visibilityUi: 'always' as const,
+			visibilityPrompt: false,
+			payloadRaw: '{"ok":true}',
+		};
+
+		const requestParts = buildEntryPartsEditorRequestParts({
+			draftParts: [newPart],
+			removedParts: [],
+		});
+
+		expect(requestParts).toEqual([
+			expect.objectContaining({
+				clientPartId: 'new-block',
+				channel: 'aux',
+				payloadFormat: 'json',
+				payload: { ok: true },
+			}),
+		]);
+	});
+
+	it('selects a text-like fallback main after removing the current main', () => {
+		const jsonPart = createDraftPartFromSource(makePart({ partId: 'json', payloadFormat: 'json', payload: { a: 1 } }));
+		const textPart = createDraftPartFromSource(makePart({ partId: 'text', payloadFormat: 'text', payload: 'text' }));
+
+		expect(resolveFallbackMainPartId([jsonPart, textPart])).toBe('text');
+	});
+});
diff --git a/web/src/features/chat-window/message/entry-parts-editor-state.ts b/web/src/features/chat-window/message/entry-parts-editor-state.ts
new file mode 100644
index 00000000..d7b848d8
--- /dev/null
+++ b/web/src/features/chat-window/message/entry-parts-editor-state.ts
@@ -0,0 +1,115 @@
+import type { Part } from '@shared/types/chat-entry-parts';
+
+export type DraftPartState = {
+	id: string;
+	partId?: string;
+	clientPartId?: string;
+	channel: Part['channel'];
+	payloadFormat: Part['payloadFormat'];
+	source: Part['source'];
+	replacesPartId: string | null;
+	visibilityUi: 'always' | 'never';
+	visibilityPrompt: boolean;
+	payloadRaw: string;
+};
+
+export function sortPartsStable(left: Part, right: Part): number {
+	if (left.order !== right.order) return left.order - right.order;
+	return left.partId.localeCompare(right.partId);
+}
+
+export function toPartPayloadRaw(part: Part): string {
+	if (part.payloadFormat === 'json') {
+		if (typeof part.payload === 'string') return part.payload;
+		try {
+			return JSON.stringify(part.payload, null, 2);
+		} catch {
+			return String(part.payload);
+		}
+	}
+
+	if (typeof part.payload === 'string') return part.payload;
+	try {
+		return JSON.stringify(part.payload);
+	} catch {
+		return String(part.payload);
+	}
+}
+
+export function createDraftPartFromSource(part: Part): DraftPartState {
+	return {
+		id: part.partId,
+		partId: part.partId,
+		channel: part.channel,
+		payloadFormat: part.payloadFormat,
+		source: part.source,
+		replacesPartId: typeof part.replacesPartId === 'string' && part.replacesPartId.trim().length > 0 ? part.replacesPartId : null,
+		visibilityUi: part.visibility?.ui === 'never' ? 'never' : 'always',
+		visibilityPrompt: Boolean(part.visibility?.prompt),
+		payloadRaw: toPartPayloadRaw(part),
+	};
+}
+
+export function createNewDraftPart(index: number): DraftPartState {
+	const clientPartId = `new-part-${Date.now()}-${index}`;
+	return {
+		id: clientPartId,
+		clientPartId,
+		channel: 'aux',
+		payloadFormat: 'markdown',
+		source: 'user',
+		replacesPartId: null,
+		visibilityUi: 'always',
+		visibilityPrompt: true,
+		payloadRaw: '',
+	};
+}
+
+export function isTextLikeDraftPart(part: DraftPartState): boolean {
+	return part.payloadFormat === 'text' || part.payloadFormat === 'markdown';
+}
+
+export function resolveFallbackMainPartId(parts: DraftPartState[]): string {
+	return parts.find(isTextLikeDraftPart)?.id ?? parts[0]?.id ?? '';
+}
+
+export function parseDraftPayload(part: DraftPartState): string | object | number | boolean | null {
+	if (part.payloadFormat === 'json') {
+		return JSON.parse(part.payloadRaw) as string | object | number | boolean | null;
+	}
+	return part.payloadRaw;
+}
+
+export function buildEntryPartsEditorRequestParts(params: {
+	draftParts: DraftPartState[];
+	removedParts: Part[];
+}): Array<{
+	partId?: string;
+	clientPartId?: string;
+	deleted?: boolean;
+	channel?: Part['channel'];
+	payloadFormat?: Part['payloadFormat'];
+	visibility: { ui: 'always' | 'never'; prompt: boolean };
+	payload: string | object | number | boolean | null;
+}> {
+	const activeParts = params.draftParts.map((part) => ({
+		...(part.partId ? { partId: part.partId, deleted: false } : { clientPartId: part.clientPartId, channel: part.channel, payloadFormat: part.payloadFormat }),
+		visibility: {
+			ui: part.visibilityUi,
+			prompt: part.visibilityPrompt,
+		},
+		payload: parseDraftPayload(part),
+	}));
+
+	const deletedParts = params.removedParts.map((part) => ({
+		partId: part.partId,
+		deleted: true,
+		visibility: {
+			ui: part.visibility?.ui === 'never' ? ('never' as const) : ('always' as const),
+			prompt: Boolean(part.visibility?.prompt),
+		},
+		payload: part.payload,
+	}));
+
+	return [...activeParts, ...deletedParts];
+}
diff --git a/web/src/features/chat-window/message/message-action-modals.tsx b/web/src/features/chat-window/message/message-action-modals.tsx
index 7f08854d..a0fc9e7a 100644
--- a/web/src/features/chat-window/message/message-action-modals.tsx
+++ b/web/src/features/chat-window/message/message-action-modals.tsx
@@ -1,33 +1,20 @@
-import { ActionIcon, Alert, Button, Group, Modal, Paper, ScrollArea, Stack, Switch, Table, Tabs, Text, Textarea } from '@mantine/core';
+import { Button, Group, Modal, Paper, ScrollArea, Stack, Table, Tabs, Text } from '@mantine/core';
 import { useUnit } from 'effector-react';
-import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { LuArrowDown, LuArrowUp, LuStar } from 'react-icons/lu';
 
 import {
-	$entries,
-	$deleteConfirmState,
-	$entryPartsEditorState,
 	$promptInspectorState,
 	$undoCanonicalizationPickerState,
-	batchUpdateEntryPartsFx,
-	closeEntryPartsEditorRequested,
 	closeUndoCanonicalizationPickerRequested,
-	closeDeleteConfirm,
 	closePromptInspectorRequested,
-	confirmDeleteAction,
 	confirmUndoCanonicalizationRequested,
-	saveEntryPartsEditorRequested,
-	deleteVariantFx,
 	selectUndoCanonicalizationStepRequested,
-	softDeleteEntriesBulkFx,
-	softDeleteEntryFx,
-	softDeletePartFx,
 	undoCanonicalizationFx,
 	undoCanonicalizationRequested,
 } from '@model/chat-entry-parts';
 
-import type { Part } from '@shared/types/chat-entry-parts';
+import { DeleteConfirmModal } from './delete-confirm-modal';
+import { EntryPartsEditorModal } from './entry-parts-editor-modal';
 
 function formatTokenShare(value: number, total: number): string {
 	if (total <= 0) return '0%';
@@ -38,51 +25,9 @@ function buildRawPrompt(messages: Array<{ role: 'system' | 'user' | 'assistant';
 	return messages.map((item) => `[${item.role.toUpperCase()}]\n${item.content}`).join('\n\n---\n\n');
 }
 
-type DraftPartState = {
-	partId: string;
-	channel: Part['channel'];
-	payloadFormat: Part['payloadFormat'];
-	source: Part['source'];
-	replacesPartId: string | null;
-	deleted: boolean;
-	visibilityUi: 'always' | 'never';
-	visibilityPrompt: boolean;
-	payloadRaw: string;
-};
-
-function sortPartsStable(left: Part, right: Part): number {
-	if (left.order !== right.order) return left.order - right.order;
-	return left.partId.localeCompare(right.partId);
-}
-
-function toPartPayloadRaw(part: Part): string {
-	if (part.payloadFormat === 'json') {
-		if (typeof part.payload === 'string') return part.payload;
-		try {
-			return JSON.stringify(part.payload, null, 2);
-		} catch {
-			return String(part.payload);
-		}
-	}
-
-	if (typeof part.payload === 'string') return part.payload;
-	try {
-		return JSON.stringify(part.payload);
-	} catch {
-		return String(part.payload);
-	}
-}
-
 export const MessageActionModals = () => {
 	const { t } = useTranslation();
 	const [
-		deleteState,
-		closeDelete,
-		confirmDelete,
-		deleteEntryPending,
-		deleteVariantPending,
-		deletePartPending,
-		deleteBulkPending,
 		promptInspector,
 		closePromptInspector,
 		undoPicker,
@@ -92,13 +37,6 @@ export const MessageActionModals = () => {
 		requestUndoCanonicalization,
 		undoPending,
 	] = useUnit([
-		$deleteConfirmState,
-		closeDeleteConfirm,
-		confirmDeleteAction,
-		softDeleteEntryFx.pending,
-		deleteVariantFx.pending,
-		softDeletePartFx.pending,
-		softDeleteEntriesBulkFx.pending,
 		$promptInspectorState,
 		closePromptInspectorRequested,
 		$undoCanonicalizationPickerState,
@@ -108,44 +46,6 @@ export const MessageActionModals = () => {
 		undoCanonicalizationRequested,
 		undoCanonicalizationFx.pending,
 	]);
-	const [entries, entryPartsEditorState, closeEntryPartsEditor, saveEntryPartsEditor, partsEditorSaving] = useUnit([
-		$entries,
-		$entryPartsEditorState,
-		closeEntryPartsEditorRequested,
-		saveEntryPartsEditorRequested,
-		batchUpdateEntryPartsFx.pending,
-	]);
-	const [draftParts, setDraftParts] = useState<DraftPartState[]>([]);
-	const [orderedPartIds, setOrderedPartIds] = useState<string[]>([]);
-	const [mainPartId, setMainPartId] = useState<string>('');
-
-	const deleteBusy =
-		deleteState?.kind === 'entry'
-			? deleteEntryPending
-			: deleteState?.kind === 'variant'
-				? deleteVariantPending
-				: deleteState?.kind === 'part'
-					? deletePartPending
-					: deleteState?.kind === 'bulkEntries'
-						? deleteBulkPending
-						: false;
-
-	const deleteTitle =
-		deleteState?.kind === 'entry'
-			? t('chat.confirm.deleteMessageTitle')
-			: deleteState?.kind === 'variant'
-				? t('chat.confirm.deleteVariantTitle')
-				: deleteState?.kind === 'part'
-					? t('chat.confirm.deletePartTitle')
-					: t('chat.confirm.deleteBulkMessagesTitle');
-	const deleteBody =
-		deleteState?.kind === 'entry'
-			? t('chat.confirm.deleteMessageBody')
-			: deleteState?.kind === 'variant'
-				? t('chat.confirm.deleteVariantBody')
-				: deleteState?.kind === 'part'
-					? t('chat.confirm.deletePartBody')
-					: t('chat.confirm.deleteBulkMessagesBody', { count: deleteState?.kind === 'bulkEntries' ? deleteState.count : 0 });
 
 	const total = promptInspector.data?.prompt.approxTokens.total ?? 0;
 	const roleRows = promptInspector.data
@@ -203,368 +103,11 @@ export const MessageActionModals = () => {
 	const turnCanonicalizations = promptInspector.data?.turnCanonicalizations ?? [];
 	const canConfirmUndoFromPicker =
 		undoPicker.open && undoPicker.steps.length > 0 && typeof undoPicker.selectedPartId === 'string';
-	const editedEntry = useMemo(() => {
-		if (!entryPartsEditorState.entryId) return null;
-		return entries.find((item) => item.entry.entryId === entryPartsEditorState.entryId) ?? null;
-	}, [entries, entryPartsEditorState.entryId]);
-	const sourceParts = useMemo(
-		() =>
-			(editedEntry?.variant?.parts ?? [])
-				.filter((part) => !part.softDeleted)
-				.slice()
-				.sort(sortPartsStable),
-		[editedEntry?.variant?.parts],
-	);
-
-	useEffect(() => {
-		if (!entryPartsEditorState.open) return;
-		const nextDraft = sourceParts.map((part) => ({
-			partId: part.partId,
-			channel: part.channel,
-			payloadFormat: part.payloadFormat,
-			source: part.source,
-			replacesPartId: typeof part.replacesPartId === 'string' && part.replacesPartId.trim().length > 0 ? part.replacesPartId : null,
-			deleted: false,
-			visibilityUi: part.visibility?.ui === 'never' ? ('never' as const) : ('always' as const),
-			visibilityPrompt: Boolean(part.visibility?.prompt),
-			payloadRaw: toPartPayloadRaw(part),
-		}));
-		setDraftParts(nextDraft);
-		setOrderedPartIds(nextDraft.map((part) => part.partId));
-		const fallbackMain =
-			nextDraft.find((part) => part.channel === 'main') ??
-			nextDraft.find((part) => part.payloadFormat === 'text' || part.payloadFormat === 'markdown') ??
-			nextDraft[0] ??
-			null;
-		setMainPartId(fallbackMain?.partId ?? '');
-	}, [entryPartsEditorState.open, sourceParts]);
-
-	const orderIndexByPartId = useMemo(() => {
-		const map = new Map<string, number>();
-		orderedPartIds.forEach((partId, index) => {
-			map.set(partId, index);
-		});
-		return map;
-	}, [orderedPartIds]);
-
-	const orderedDraftParts = useMemo(() => {
-		return draftParts
-			.slice()
-			.sort((left, right) => {
-				const leftIndex = orderIndexByPartId.get(left.partId);
-				const rightIndex = orderIndexByPartId.get(right.partId);
-				if (typeof leftIndex === 'number' && typeof rightIndex === 'number') return leftIndex - rightIndex;
-				if (typeof leftIndex === 'number') return -1;
-				if (typeof rightIndex === 'number') return 1;
-				return left.partId.localeCompare(right.partId);
-			});
-	}, [draftParts, orderIndexByPartId]);
-
-	const nonDeletedPartIds = useMemo(
-		() => draftParts.filter((part) => !part.deleted).map((part) => part.partId),
-		[draftParts],
-	);
-	const nonDeletedPartSet = useMemo(() => new Set(nonDeletedPartIds), [nonDeletedPartIds]);
-	const jsonInvalidPartIds = useMemo(() => {
-		const invalid = new Set<string>();
-		for (const part of draftParts) {
-			if (part.deleted || part.payloadFormat !== 'json') continue;
-			try {
-				JSON.parse(part.payloadRaw);
-			} catch {
-				invalid.add(part.partId);
-			}
-		}
-		return invalid;
-	}, [draftParts]);
-	const mainDraftPart = useMemo(
-		() => draftParts.find((part) => part.partId === mainPartId) ?? null,
-		[draftParts, mainPartId],
-	);
-	const orderMatchesVisibleParts = useMemo(() => {
-		if (orderedPartIds.length !== nonDeletedPartIds.length) return false;
-		const seen = new Set<string>();
-		for (const partId of orderedPartIds) {
-			if (seen.has(partId)) return false;
-			if (!nonDeletedPartSet.has(partId)) return false;
-			seen.add(partId);
-		}
-		return true;
-	}, [orderedPartIds, nonDeletedPartIds.length, nonDeletedPartSet]);
-	const mainPartValid = Boolean(
-		mainDraftPart &&
-			!mainDraftPart.deleted &&
-			(mainDraftPart.payloadFormat === 'text' || mainDraftPart.payloadFormat === 'markdown'),
-	);
-	const canSavePartsEditor =
-		entryPartsEditorState.open &&
-		Boolean(editedEntry?.variant) &&
-		nonDeletedPartIds.length > 0 &&
-		orderMatchesVisibleParts &&
-		mainPartValid &&
-		jsonInvalidPartIds.size === 0 &&
-		!partsEditorSaving;
-
-	const updateDraftPart = (partId: string, updater: (part: DraftPartState) => DraftPartState) => {
-		setDraftParts((prev) => prev.map((part) => (part.partId === partId ? updater(part) : part)));
-	};
-
-	const movePart = (partId: string, direction: 'up' | 'down') => {
-		setOrderedPartIds((prev) => {
-			const fromIndex = prev.indexOf(partId);
-			if (fromIndex < 0) return prev;
-			if (direction === 'up' && fromIndex === 0) return prev;
-			if (direction === 'down' && fromIndex === prev.length - 1) return prev;
-			const targetIndex = direction === 'up' ? fromIndex - 1 : fromIndex + 1;
-			const next = prev.slice();
-			const tmp = next[targetIndex];
-			next[targetIndex] = next[fromIndex] as string;
-			next[fromIndex] = tmp as string;
-			return next;
-		});
-	};
-
-	const togglePartDeleted = (partId: string, deleted: boolean) => {
-		const nextDraftParts = draftParts.map((part) => (part.partId === partId ? { ...part, deleted } : part));
-		setDraftParts(nextDraftParts);
-		setOrderedPartIds((prev) => {
-			if (deleted) return prev.filter((id) => id !== partId);
-			if (prev.includes(partId)) return prev;
-			return [...prev, partId];
-		});
-		if (!deleted || mainPartId !== partId) return;
-		const fallbackMain =
-			nextDraftParts.find(
-				(part) => !part.deleted && (part.payloadFormat === 'text' || part.payloadFormat === 'markdown'),
-			) ??
-			nextDraftParts.find((part) => !part.deleted) ??
-			null;
-		setMainPartId(fallbackMain?.partId ?? '');
-	};
-
-	const savePartsEditorChanges = () => {
-		if (!editedEntry?.variant) return;
-		if (!canSavePartsEditor) return;
-		let payloadParts: Array<{
-			partId: string;
-			deleted: boolean;
-			visibility: { ui: 'always' | 'never'; prompt: boolean };
-			payload: string | object | number | boolean | null;
-		}> = [];
-		try {
-			payloadParts = draftParts.map((part) => {
-				let payload: string | object | number | boolean | null = part.payloadRaw;
-				if (part.payloadFormat === 'json') {
-					payload = JSON.parse(part.payloadRaw) as string | object | number | boolean | null;
-				}
-				return {
-					partId: part.partId,
-					deleted: part.deleted,
-					visibility: {
-						ui: part.visibilityUi,
-						prompt: part.visibilityPrompt,
-					},
-					payload,
-				};
-			});
-		} catch {
-			return;
-		}
-		saveEntryPartsEditor({
-			entryId: editedEntry.entry.entryId,
-			variantId: editedEntry.variant.variantId,
-			mainPartId,
-			orderedPartIds,
-			parts: payloadParts,
-		});
-	};
 
 	return (
 		<>
-			{deleteState && (
-				<Modal opened onClose={() => closeDelete()} title={deleteTitle} centered closeOnClickOutside={!deleteBusy} closeOnEscape={!deleteBusy}>
-					<Stack gap="md">
-						<Text size="sm">{deleteBody}</Text>
-						<Group justify="flex-end">
-							<Button variant="subtle" onClick={() => closeDelete()} disabled={deleteBusy}>
-								{t('common.cancel')}
-							</Button>
-							<Button color="red" onClick={() => confirmDelete()} loading={deleteBusy}>
-								{t('common.delete')}
-							</Button>
-						</Group>
-					</Stack>
-				</Modal>
-			)}
-
-			<Modal
-				opened={entryPartsEditorState.open}
-				onClose={() => {
-					if (partsEditorSaving) return;
-					closeEntryPartsEditor();
-				}}
-				title={t('chat.partsEditor.title')}
-				centered
-				size="xl"
-				closeOnClickOutside={!partsEditorSaving}
-				closeOnEscape={!partsEditorSaving}
-			>
-				<Stack gap="sm">
-					{!editedEntry?.variant && (
-						<Text size="sm" c="dimmed">
-							{t('chat.partsEditor.empty')}
-						</Text>
-					)}
-					{editedEntry?.variant && (
-						<>
-							{nonDeletedPartIds.length === 0 && (
-								<Alert color="red" variant="light">
-									{t('chat.partsEditor.validation.noParts')}
-								</Alert>
-							)}
-							{!mainPartValid && (
-								<Alert color="red" variant="light">
-									{t('chat.partsEditor.validation.mainPart')}
-								</Alert>
-							)}
-							{jsonInvalidPartIds.size > 0 && (
-								<Alert color="red" variant="light">
-									{t('chat.partsEditor.validation.json')}
-								</Alert>
-							)}
-							<ScrollArea.Autosize mah={460}>
-								<Stack gap="xs">
-									{orderedDraftParts.map((part) => {
-										const orderIndex = orderedPartIds.indexOf(part.partId);
-										const isMain = part.partId === mainPartId;
-										const canSelectAsMain =
-											!part.deleted && (part.payloadFormat === 'text' || part.payloadFormat === 'markdown');
-										const isJsonInvalid =
-											part.payloadFormat === 'json' && jsonInvalidPartIds.has(part.partId);
-										return (
-											<Paper key={part.partId} withBorder radius="sm" p="sm" style={part.deleted ? { opacity: 0.6 } : undefined}>
-												<Stack gap="xs">
-													<Group justify="space-between" align="flex-start" wrap="nowrap">
-														<Stack gap={0}>
-															<Text size="sm" fw={600}>
-																{part.partId}
-															</Text>
-															<Text size="xs" c="dimmed">
-																{t('chat.partsEditor.meta.channel')}: {part.channel} | {t('chat.partsEditor.meta.source')}:{' '}
-																{part.source}
-															</Text>
-															<Text size="xs" c="dimmed">
-																{t('chat.partsEditor.meta.format')}: {part.payloadFormat}
-															</Text>
-															{part.replacesPartId && (
-																<Text size="xs" c="dimmed">
-																	{t('chat.partsEditor.meta.replaces')}: {part.replacesPartId}
-																</Text>
-															)}
-														</Stack>
-														<Group gap={6} align="center" wrap="nowrap">
-															<ActionIcon
-																variant="subtle"
-																onClick={() => movePart(part.partId, 'up')}
-																disabled={part.deleted || orderIndex <= 0}
-																aria-label={t('chat.partsEditor.actions.moveUp')}
-															>
-																<LuArrowUp size={14} />
-															</ActionIcon>
-															<ActionIcon
-																variant="subtle"
-																onClick={() => movePart(part.partId, 'down')}
-																disabled={part.deleted || orderIndex < 0 || orderIndex >= orderedPartIds.length - 1}
-																aria-label={t('chat.partsEditor.actions.moveDown')}
-															>
-																<LuArrowDown size={14} />
-															</ActionIcon>
-															<Button
-																size="xs"
-																variant={isMain ? 'filled' : 'light'}
-																color={isMain ? 'yellow' : 'gray'}
-																leftSection={<LuStar size={12} />}
-																disabled={!canSelectAsMain}
-																onClick={() => setMainPartId(part.partId)}
-															>
-																{isMain
-																	? t('chat.partsEditor.actions.mainSelected')
-																	: t('chat.partsEditor.actions.makeMain')}
-															</Button>
-														</Group>
-													</Group>
-													<Group gap="md" wrap="wrap">
-														<Switch
-															checked={part.deleted}
-															label={t('chat.partsEditor.fields.deleted')}
-															onChange={(event) => togglePartDeleted(part.partId, event.currentTarget.checked)}
-														/>
-														<Switch
-															checked={part.visibilityUi === 'always'}
-															disabled={part.deleted}
-															label={t('chat.partsEditor.fields.showInUi')}
-															onChange={(event) => {
-																const checked = event.currentTarget.checked;
-																updateDraftPart(part.partId, (prev) => ({
-																	...prev,
-																	visibilityUi: checked ? 'always' : 'never',
-																}));
-															}}
-														/>
-														<Switch
-															checked={part.visibilityPrompt}
-															disabled={part.deleted}
-															label={t('chat.partsEditor.fields.includeInPrompt')}
-															onChange={(event) => {
-																const checked = event.currentTarget.checked;
-																updateDraftPart(part.partId, (prev) => ({
-																	...prev,
-																	visibilityPrompt: checked,
-																}));
-															}}
-														/>
-													</Group>
-													<Textarea
-														label={
-															part.payloadFormat === 'json'
-																? t('chat.partsEditor.fields.payloadJson')
-																: t('chat.partsEditor.fields.payloadText')
-														}
-														value={part.payloadRaw}
-														disabled={part.deleted}
-														minRows={part.payloadFormat === 'json' ? 5 : 3}
-														autosize
-														onChange={(event) => {
-															const value = event.currentTarget.value;
-															updateDraftPart(part.partId, (prev) => ({
-																...prev,
-																payloadRaw: value,
-															}));
-														}}
-													/>
-													{isJsonInvalid && (
-														<Text size="xs" c="red">
-															{t('chat.partsEditor.validation.jsonPart', { partId: part.partId })}
-														</Text>
-													)}
-												</Stack>
-											</Paper>
-										);
-									})}
-								</Stack>
-							</ScrollArea.Autosize>
-							<Group justify="flex-end">
-								<Button variant="subtle" disabled={partsEditorSaving} onClick={() => closeEntryPartsEditor()}>
-									{t('common.cancel')}
-								</Button>
-								<Button onClick={savePartsEditorChanges} loading={partsEditorSaving} disabled={!canSavePartsEditor}>
-									{t('common.save')}
-								</Button>
-							</Group>
-						</>
-					)}
-				</Stack>
-			</Modal>
+			<DeleteConfirmModal />
+			<EntryPartsEditorModal />
 
 			<Modal
 				opened={promptInspector.open}
diff --git a/web/src/i18n/resources/en/chat.ts b/web/src/i18n/resources/en/chat.ts
index fbe7e059..0a4e11e6 100644
--- a/web/src/i18n/resources/en/chat.ts
+++ b/web/src/i18n/resources/en/chat.ts
@@ -106,13 +106,16 @@
 					replaces: 'Replaces',
 				},
 				actions: {
+					addPart: 'Add block',
 					moveUp: 'Move up',
 					moveDown: 'Move down',
 					makeMain: 'Set as main',
 					mainSelected: 'Main',
+					removePart: 'Delete block',
 				},
 				fields: {
-					deleted: 'Delete part',
+					channel: 'Channel',
+					format: 'Format',
 					showInUi: 'Show in UI',
 					includeInPrompt: 'Include in prompt',
 					payloadJson: 'JSON payload',
diff --git a/web/src/i18n/resources/ru/chat.ts b/web/src/i18n/resources/ru/chat.ts
index 9be9a822..48e536d4 100644
--- a/web/src/i18n/resources/ru/chat.ts
+++ b/web/src/i18n/resources/ru/chat.ts
@@ -106,13 +106,16 @@
 					replaces: 'Заменяет',
 				},
 				actions: {
+					addPart: 'Добавить блок',
 					moveUp: 'Переместить вверх',
 					moveDown: 'Переместить вниз',
 					makeMain: 'Сделать основным',
 					mainSelected: 'Основной',
+					removePart: 'Удалить блок',
 				},
 				fields: {
-					deleted: 'Удалить блок',
+					channel: 'Канал',
+					format: 'Формат',
 					showInUi: 'Показывать в UI',
 					includeInPrompt: 'Включать в prompt',
 					payloadJson: 'JSON payload',

From 9b58240bdc007b5ab50376ede6ac82e7fc70bd8c Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 25 Apr 2026 21:06:05 +0300
Subject: [PATCH 49/54] docs: add functional review report

---
 FUNCTIONAL_REVIEW_REPORT_2026-04-25.md | 118 +++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 FUNCTIONAL_REVIEW_REPORT_2026-04-25.md

diff --git a/FUNCTIONAL_REVIEW_REPORT_2026-04-25.md b/FUNCTIONAL_REVIEW_REPORT_2026-04-25.md
new file mode 100644
index 00000000..46dd76f2
--- /dev/null
+++ b/FUNCTIONAL_REVIEW_REPORT_2026-04-25.md
@@ -0,0 +1,118 @@
+# Functional Review Report - TaleSpinner
+
+Дата ревью: 2026-04-25  
+Область: frontend UX, логика пользовательских сценариев, наблюдаемая работа локального dev-окружения.  
+Исключено из оценки: безопасность, хранение секретов, threat model.
+
+## Краткий вывод
+
+Приложение запускается, frontend typecheck/lint/tests проходят. Основные проблемы не в компиляции, а в UX-структуре: контекст текущего чата почти скрыт, мобильный чат перекрывается композером, ключевые операции спрятаны в маленьком меню, а часть интерфейса использует системные confirm-диалоги и сыроватые тексты.
+
+## Приоритетные проблемы
+
+### P1. На мобильном экране композер перекрывает последнее сообщение
+
+**Где:** `web/src/index.css:304`, `web/src/index.css:311`, `web/src/index.css:713`; `web/src/features/chat-window/index.tsx`.
+
+**Что видно:** при viewport `390x844` нижняя часть последнего сообщения уходит под sticky-композер. Пользователь видит поле ввода поверх текста и не может нормально дочитать нижний фрагмент без постоянной прокрутки.
+
+**Почему это нелогично:** чат - главный сценарий приложения. Ввод должен быть закреплен, но scrollable-контент обязан иметь нижний отступ минимум на высоту композера плюс safe-area.
+
+**Рекомендация:** вынести композер из scroll-контейнера или добавить управляемый bottom spacer внутри списка сообщений. Для мобильного режима отдельно проверить `safe-area-inset-bottom`, высоту кнопок и многострочный textarea.
+
+### P1. Текущий чат и ветка не отображаются в основной рабочей области
+
+**Где:** `web/src/features/chat-window/chat-header.tsx` существует, но `rg "ChatHeader" web/src` показывает только его объявление; в `web/src/features/chat-window/index.tsx` компонент не используется.
+
+**Что видно:** на рабочем экране нет явного заголовка с профилем, чатом и веткой. Эти данные доступны только в скрытом меню управления чатом.
+
+**Почему это нелогично:** TaleSpinner опирается на профили, чаты и ветки. Если пользователь не видит активный контекст постоянно, легко писать не туда, перепутать ветку или не заметить переключение.
+
+**Рекомендация:** вернуть `ChatHeader` в верхнюю часть chat window и разместить в нем активный профиль, чат, ветку, быстрый переключатель/rename и состояние генерации.
+
+### P2. Ключевые действия чата спрятаны в маленьком меню под полем ввода
+
+**Где:** `web/src/features/chat-window/input/chat-management-menu.tsx:139-180`.
+
+**Что видно:** создание чата, управление чатами, управление ветками, bulk delete, привязка World Info и диагностика активаций находятся в одном меню за иконкой настроек в композере.
+
+**Почему это нелогично:** создание/выбор чата и ветки - первичные навигационные действия, а World Info diagnostics - вторичный debug/inspection сценарий. В одном меню они конкурируют и плохо обнаруживаются, особенно на мобильном экране.
+
+**Рекомендация:** вынести чат/ветку в header, bulk delete оставить как явный режим в панели сообщений, World Info diagnostics переместить в отдельную секцию/инспектор.
+
+### P2. Нативные `window.confirm` ломают единый UX подтверждений
+
+**Где:** множественные места, например `web/src/features/chat-window/input/chat-management-menu.tsx:343`, `web/src/features/chat-window/input/chat-management-menu.tsx:471`, `web/src/features/sidebars/world-info/index.tsx:223`, `web/src/features/llm-provider/llm-provider-panel.tsx:194`.
+
+**Что видно:** часть действий использует собственные `Dialog`, часть - браузерный confirm. Визуально и поведенчески это разные паттерны.
+
+**Почему это нелогично:** приложение уже имеет `@ui/dialog`, поэтому системные confirm-окна выглядят как инородные элементы, хуже локализуются по контексту и хуже подходят для сложных destructive flows.
+
+**Рекомендация:** унифицировать подтверждения через общий confirm-dialog service/component с текстом действия, именем сущности и явной destructive-кнопкой.
+
+### P2. Слишком крупные файлы затрудняют сопровождение пользовательских сценариев
+
+**Где:** `web/src/model/chat-entry-parts/index.ts` - 1850 строк, `web/src/features/chat-window/input/chat-management-menu.tsx` - 558 строк, `web/src/features/sidebars/instructions/index.tsx` - 722 строки, `web/src/features/sidebars/agent-cards/index.tsx` - 663 строки.
+
+**Что видно:** несколько разных сценариев живут в одном файле: списки, модалки, inline rename, World Info diagnostics, bulk actions, ветки.
+
+**Почему это нелогично:** это уже влияет на UX-эволюцию: чтобы поправить одну модалку или вынести один пункт меню, приходится держать в голове слишком много соседней логики.
+
+**Рекомендация:** выделять touched slices перед новыми изменениями: chat menu actions, chat list dialog, branch dialog, World Info activation dialog, bulk delete flow, entry parts effects.
+
+### P3. Мобильная левая рейка забирает слишком много полезной ширины
+
+**Где:** `web/src/index.css:713-719`.
+
+**Что видно:** на ширине 390px рейка остается вертикальной и занимает 54px. Для текста чата остается узкая колонка, строки становятся слишком короткими.
+
+**Почему это нелогично:** приложение текстоцентричное. На телефоне приоритет должен быть у чтения и ввода, а глобальная навигация может быть bottom nav, drawer-trigger или collapsible rail.
+
+**Рекомендация:** на mobile заменить постоянную рейку на нижнюю навигацию/кнопку меню или позволить ей скрываться.
+
+### P3. В RU-интерфейсе встречаются английские/технические формулировки
+
+**Где:** `web/src/App.tsx:65`, `web/src/i18n/resources/ru/app.ts:5`, `web/src/i18n/resources/ru/chat.ts:42`.
+
+**Что видно:** профиль по кнопке создается как `New profile ...`; пустое состояние говорит `Entity Profile`; в RU-строке World Info остается `Generation`.
+
+**Почему это нелогично:** локализация в целом есть, поэтому отдельные английские термины выглядят как незавершенность интерфейса. Для пользователя лучше единый словарь: "профиль персонажа/агента", "поколение/генерация", и локализованный шаблон имени.
+
+**Рекомендация:** вынести default profile name в i18n, согласовать термин `Entity Profile` в RU, заменить технические остатки в ресурсах.
+
+### P3. Ошибки API форматируются неодинаково
+
+**Где:** `web/src/api/api-json.ts:5`, `web/src/api/chat-core.ts:19`, `web/src/api/llm.ts:19`, `web/src/api/chat-entry-parts.ts:13`.
+
+**Что видно:** есть общий `getApiErrorMessage`, но часть API-клиентов использует свой `apiJson` и возвращает `body.error.message ?? HTTP error`.
+
+**Почему это нелогично:** пользовательские ошибки в разных разделах могут выглядеть по-разному: где-то поле валидации будет человекочитаемым, где-то останется серверный текст.
+
+**Рекомендация:** оставить один общий API helper с `getApiErrorMessage`, а специализированные клиенты свести к тонким оберткам.
+
+## Дополнительные наблюдения
+
+- Первый быстрый headless screenshot поймал только экран `Загрузка приложения...`; после ожидания через Chrome DevTools Protocol приложение загрузилось нормально.
+- Vite стартовал на `http://localhost:5174/`, потому что `5173` уже был занят.
+- Backend API на `http://localhost:5000/api/entity-profiles` отвечал `200`.
+- В console/network во время проверки был только `404` на `favicon.ico`; функционально это не блокер.
+
+## Выполненные проверки
+
+- `git status --short --branch`
+- `yarn dev` для локального запуска
+- `Invoke-WebRequest http://localhost:5174/`
+- `Invoke-WebRequest http://localhost:5000/api/entity-profiles`
+- Headless Chrome/Edge screenshots для desktop/mobile
+- Chrome DevTools Protocol snapshot после инициализации приложения
+- `yarn typecheck:web` - passed
+- `yarn lint:web` - passed
+- `yarn --cwd web test` - passed, 31 files / 104 tests
+
+## Итоговый порядок исправлений
+
+1. Починить mobile-композер и вернуть видимый chat header.
+2. Разнести chat management menu на header actions, chat/branch dialogs и debug/World Info inspector.
+3. Заменить `window.confirm` на единый `Dialog`-based confirmation flow.
+4. При следующих изменениях не расширять крупные файлы, а извлекать конкретный сценарий в отдельный модуль.
+5. Пройтись по RU/EN словарю и унифицировать пользовательские термины.

From 6b9915a3a881c4d1c0b15cca58a3167ed609a6fc Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 25 Apr 2026 21:21:44 +0300
Subject: [PATCH 50/54] fix: normalize persisted sidebar widths to lg

---
 web/src/model/sidebars.test.ts | 30 ++++++++++++++++++++++++++++++
 web/src/model/sidebars.ts      | 30 +++++++++++++-----------------
 2 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 web/src/model/sidebars.test.ts

diff --git a/web/src/model/sidebars.test.ts b/web/src/model/sidebars.test.ts
new file mode 100644
index 00000000..f96f79aa
--- /dev/null
+++ b/web/src/model/sidebars.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest';
+
+import { defaultSidebars, mergeSidebarsState, type SidebarSettings } from './sidebars';
+
+describe('sidebars model', () => {
+	it('normalizes persisted standard drawer sizes to the shared default width', () => {
+		const incoming: SidebarSettings = {
+			instructions: {
+				isOpen: false,
+				isFullscreen: false,
+				placement: 'start',
+				size: 'md',
+				contained: false,
+			},
+			agentCards: {
+				isOpen: false,
+				isFullscreen: true,
+				placement: 'end',
+				size: 'xl',
+				contained: false,
+			},
+		};
+
+		const merged = mergeSidebarsState(defaultSidebars, incoming);
+
+		expect(merged.instructions.size).toBe('lg');
+		expect(merged.agentCards.size).toBe('lg');
+		expect(merged.agentCards.isFullscreen).toBe(true);
+	});
+});
diff --git a/web/src/model/sidebars.ts b/web/src/model/sidebars.ts
index d5d78cb2..03584332 100644
--- a/web/src/model/sidebars.ts
+++ b/web/src/model/sidebars.ts
@@ -55,28 +55,27 @@ export const defaultSidebars: SidebarSettings = {
 	},
 };
 
+const standardSidebarNames = Object.keys(defaultSidebars);
+
 function normalizeLegacySidebarSettings(incoming: SidebarSettings): SidebarSettings {
 	const normalized = { ...incoming };
-	const settings = normalized.settings;
-	const worldInfo = normalized.worldInfo;
 	const appSettings = normalized.appSettings;
 
-	if (settings && settings.size === 'sm' && !settings.isFullscreen) {
-		normalized.settings = { ...settings, size: 'lg' };
-	}
-
-	if (worldInfo && worldInfo.size === 'xl' && !worldInfo.isFullscreen) {
-		normalized.worldInfo = { ...worldInfo, size: 'lg' };
-	}
-
 	if (appSettings && appSettings.size === 'full' && appSettings.isFullscreen) {
 		normalized.appSettings = { ...appSettings, size: 'lg', isFullscreen: false };
 	}
 
+	for (const name of standardSidebarNames) {
+		const sidebar = normalized[name];
+		if (sidebar && sidebar.size !== defaultSidebarSetting.size) {
+			normalized[name] = { ...sidebar, size: defaultSidebarSetting.size };
+		}
+	}
+
 	return normalized;
 }
 
-function mergeSidebarsState(defaults: SidebarSettings, incoming: SidebarSettings): SidebarSettings {
+export function mergeSidebarsState(defaults: SidebarSettings, incoming: SidebarSettings): SidebarSettings {
 	const normalizedIncoming = normalizeLegacySidebarSettings(incoming);
 	const result: SidebarSettings = { ...defaults, ...normalizedIncoming };
 	for (const key of Object.keys(result)) {
@@ -89,13 +88,12 @@ function mergeSidebarsState(defaults: SidebarSettings, incoming: SidebarSettings
 
 export const $sidebars = createStore<SidebarSettings>(defaultSidebars);
 
-// Создаем отдельное событие для изменения isOpen
+// Dedicated event for changing isOpen.
 export const toggleSidebarOpen = createEvent<{ name: SidebarName; isOpen: boolean }>();
 
-// Создаем событие для изменения других настроек (кроме isOpen)
+// Event for changing settings other than isOpen.
 export const changeSidebarSettings = createEvent<{ name: SidebarName; settings: Partial<SidebarSetting> }>();
 
-// Обрабатываем изменение isOpen отдельно
 $sidebars.on(toggleSidebarOpen, (sidebars, { name, isOpen }) => ({
 	...sidebars,
 	[name]: {
@@ -104,9 +102,8 @@ $sidebars.on(toggleSidebarOpen, (sidebars, { name, isOpen }) => ({
 	},
 }));
 
-// Обрабатываем изменение других настроек
 $sidebars.on(changeSidebarSettings, (sidebars, { name, settings }) => {
-	// Исключаем isOpen из настроек, чтобы не перезаписать его случайно
+	// Keep isOpen controlled by toggleSidebarOpen only.
 	const { isOpen: _isOpen, ...otherSettings } = settings;
 
 	return {
@@ -139,7 +136,6 @@ export const getSettingsFx = createEffect<void, SidebarSettings>(() =>
 
 $sidebars.on(getSettingsFx.doneData, (_, payload) => mergeSidebarsState(defaultSidebars, payload));
 
-// Сохраняем настройки только при изменении через changeSidebarSettings
 sample({
 	clock: changeSidebarSettings,
 	source: $sidebars,

From d2aebdf5c42a777bebbd3860afc36f66d0f350ec Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sat, 25 Apr 2026 22:42:46 +0300
Subject: [PATCH 51/54] fix: make drawer mode click-through without overlay

---
 web/src/index.css                      |  8 ++++++++
 web/src/ui/drawer-presentation.test.ts |  9 +++++++++
 web/src/ui/drawer-presentation.ts      |  9 +++++++++
 web/src/ui/drawer.tsx                  | 18 ++++++++++++++----
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/web/src/index.css b/web/src/index.css
index 9e501ce0..2d7a31b6 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -554,6 +554,12 @@ a {
   padding: 0;
 }
 
+.ts-sidebar-modal-content--drawer,
+.ts-sidebar-modal-body--drawer,
+.ts-sidebar-frame--drawer {
+  pointer-events: none;
+}
+
 .ts-sidebar-frame {
   height: 100%;
   background: var(--ts-overlay);
@@ -567,6 +573,7 @@ a {
 .ts-sidebar-frame--drawer {
   display: flex;
   padding: 0;
+  background: transparent;
 }
 
 .ts-sidebar-frame--start {
@@ -597,6 +604,7 @@ a {
   min-height: 0;
   border-radius: 0;
   padding: 16px;
+  pointer-events: auto;
 }
 
 .ts-md {
diff --git a/web/src/ui/drawer-presentation.test.ts b/web/src/ui/drawer-presentation.test.ts
index c26ed07b..25b07520 100644
--- a/web/src/ui/drawer-presentation.test.ts
+++ b/web/src/ui/drawer-presentation.test.ts
@@ -15,6 +15,9 @@ describe('drawer-presentation', () => {
 			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--drawer ts-sidebar-frame--start',
 			containerClassName: 'ts-sidebar-container ts-sidebar-container--drawer',
 			containerStyle: { width: 560 },
+			modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--drawer',
+			modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--drawer',
+			withOverlay: false,
 		});
 	});
 
@@ -30,6 +33,9 @@ describe('drawer-presentation', () => {
 			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
 			containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
 			containerStyle: { maxWidth: 1440 },
+			modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--fullscreen',
+			modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--fullscreen',
+			withOverlay: true,
 		});
 	});
 
@@ -38,6 +44,9 @@ describe('drawer-presentation', () => {
 			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
 			containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
 			containerStyle: { maxWidth: 1320 },
+			modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--fullscreen',
+			modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--fullscreen',
+			withOverlay: true,
 		});
 	});
 });
diff --git a/web/src/ui/drawer-presentation.ts b/web/src/ui/drawer-presentation.ts
index 9c00d542..119e5dcb 100644
--- a/web/src/ui/drawer-presentation.ts
+++ b/web/src/ui/drawer-presentation.ts
@@ -9,6 +9,9 @@ type DrawerPresentation = {
 	frameClassName: string;
 	containerClassName: string;
 	containerStyle: Record<string, number | string>;
+	modalContentClassName: string;
+	modalBodyClassName: string;
+	withOverlay: boolean;
 };
 
 export function getFullscreenSidebarPresentation(fullscreenContentMaxWidth: number): DrawerPresentation {
@@ -16,6 +19,9 @@ export function getFullscreenSidebarPresentation(fullscreenContentMaxWidth: numb
 		frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
 		containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
 		containerStyle: { maxWidth: fullscreenContentMaxWidth },
+		modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--fullscreen',
+		modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--fullscreen',
+		withOverlay: true,
 	};
 }
 
@@ -33,5 +39,8 @@ export function getDrawerPresentation({
 		frameClassName: `ts-sidebar-frame ts-sidebar-frame--drawer ts-sidebar-frame--${placement}`,
 		containerClassName: 'ts-sidebar-container ts-sidebar-container--drawer',
 		containerStyle: { width: drawerWidth },
+		modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--drawer',
+		modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--drawer',
+		withOverlay: false,
 	};
 }
diff --git a/web/src/ui/drawer.tsx b/web/src/ui/drawer.tsx
index 0b0c6806..5266d63c 100644
--- a/web/src/ui/drawer.tsx
+++ b/web/src/ui/drawer.tsx
@@ -29,7 +29,14 @@ const drawerWidthBySize: Record<'xs' | 'sm' | 'md' | 'lg' | 'xl', number> = {
 	xl: 640,
 };
 
-export const Drawer = ({ name, title, children, fullscreenContentMaxWidth = 1440, fixedSize, defaultSize = 'lg' }: Props) => {
+export const Drawer = ({
+	name,
+	title,
+	children,
+	fullscreenContentMaxWidth = 1440,
+	fixedSize,
+	defaultSize = 'lg',
+}: Props) => {
 	const { t } = useTranslation();
 	const sidebar = useStoreMap({
 		store: $sidebars,
@@ -92,11 +99,14 @@ export const Drawer = ({ name, title, children, fullscreenContentMaxWidth = 1440
 			withinPortal={!contained}
 			withCloseButton={false}
 			padding={0}
-			withOverlay={!contained}
+			withOverlay={!contained && presentation.withOverlay}
+			trapFocus={fullScreen}
+			lockScroll={fullScreen}
+			closeOnClickOutside={fullScreen}
 			zIndex={Z_INDEX.overlay.drawer}
 			classNames={{
-				content: 'ts-sidebar-modal-content',
-				body: 'ts-sidebar-modal-body',
+				content: presentation.modalContentClassName,
+				body: presentation.modalBodyClassName,
 			}}
 		>
 			<Box className={`${presentation.frameClassName} ts-scrollbar-thin`}>

From 522acf2ebd2ef83b56fe2e3f925c8ab38e244874 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Sun, 26 Apr 2026 23:57:06 +0300
Subject: [PATCH 52/54] fix: move drawer scrollbar to the edge

---
 web/src/index.css                      | 9 ++++++++-
 web/src/ui/drawer-presentation.test.ts | 3 +++
 web/src/ui/drawer-presentation.ts      | 3 +++
 web/src/ui/drawer.tsx                  | 1 +
 web/src/ui/sidebar-shell.tsx           | 6 +++++-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/web/src/index.css b/web/src/index.css
index 2d7a31b6..16297597 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -598,15 +598,22 @@ a {
 }
 
 .ts-sidebar-container--drawer {
+  --ts-sidebar-drawer-padding: 16px;
+
   display: flex;
   flex-direction: column;
   height: 100vh;
   min-height: 0;
   border-radius: 0;
-  padding: 16px;
+  padding: var(--ts-sidebar-drawer-padding);
   pointer-events: auto;
 }
 
+.ts-sidebar-shell__content--edge-scrollbar {
+  margin-right: calc(var(--ts-sidebar-drawer-padding) * -1);
+  padding-right: calc(var(--ts-sidebar-drawer-padding) + 2px);
+}
+
 .ts-md {
   font-family: var(--ts-font-chat);
   font-size: var(--ts-md-font-size);
diff --git a/web/src/ui/drawer-presentation.test.ts b/web/src/ui/drawer-presentation.test.ts
index 25b07520..76a01088 100644
--- a/web/src/ui/drawer-presentation.test.ts
+++ b/web/src/ui/drawer-presentation.test.ts
@@ -15,6 +15,7 @@ describe('drawer-presentation', () => {
 			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--drawer ts-sidebar-frame--start',
 			containerClassName: 'ts-sidebar-container ts-sidebar-container--drawer',
 			containerStyle: { width: 560 },
+			shellContentClassName: 'ts-sidebar-shell__content--edge-scrollbar',
 			modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--drawer',
 			modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--drawer',
 			withOverlay: false,
@@ -33,6 +34,7 @@ describe('drawer-presentation', () => {
 			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
 			containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
 			containerStyle: { maxWidth: 1440 },
+			shellContentClassName: '',
 			modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--fullscreen',
 			modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--fullscreen',
 			withOverlay: true,
@@ -44,6 +46,7 @@ describe('drawer-presentation', () => {
 			frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
 			containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
 			containerStyle: { maxWidth: 1320 },
+			shellContentClassName: '',
 			modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--fullscreen',
 			modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--fullscreen',
 			withOverlay: true,
diff --git a/web/src/ui/drawer-presentation.ts b/web/src/ui/drawer-presentation.ts
index 119e5dcb..11474ee3 100644
--- a/web/src/ui/drawer-presentation.ts
+++ b/web/src/ui/drawer-presentation.ts
@@ -9,6 +9,7 @@ type DrawerPresentation = {
 	frameClassName: string;
 	containerClassName: string;
 	containerStyle: Record<string, number | string>;
+	shellContentClassName: string;
 	modalContentClassName: string;
 	modalBodyClassName: string;
 	withOverlay: boolean;
@@ -19,6 +20,7 @@ export function getFullscreenSidebarPresentation(fullscreenContentMaxWidth: numb
 		frameClassName: 'ts-sidebar-frame ts-sidebar-frame--fullscreen',
 		containerClassName: 'ts-sidebar-container ts-sidebar-container--fullscreen',
 		containerStyle: { maxWidth: fullscreenContentMaxWidth },
+		shellContentClassName: '',
 		modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--fullscreen',
 		modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--fullscreen',
 		withOverlay: true,
@@ -39,6 +41,7 @@ export function getDrawerPresentation({
 		frameClassName: `ts-sidebar-frame ts-sidebar-frame--drawer ts-sidebar-frame--${placement}`,
 		containerClassName: 'ts-sidebar-container ts-sidebar-container--drawer',
 		containerStyle: { width: drawerWidth },
+		shellContentClassName: 'ts-sidebar-shell__content--edge-scrollbar',
 		modalContentClassName: 'ts-sidebar-modal-content ts-sidebar-modal-content--drawer',
 		modalBodyClassName: 'ts-sidebar-modal-body ts-sidebar-modal-body--drawer',
 		withOverlay: false,
diff --git a/web/src/ui/drawer.tsx b/web/src/ui/drawer.tsx
index 5266d63c..077edfd3 100644
--- a/web/src/ui/drawer.tsx
+++ b/web/src/ui/drawer.tsx
@@ -81,6 +81,7 @@ export const Drawer = ({
 			onTogglePlacement={() =>
 				changeSidebarSettings({ name, settings: { placement: placement === 'start' ? 'end' : 'start' } })
 			}
+			contentClassName={presentation.shellContentClassName}
 			labels={{
 				toggleFullscreen: t('drawer.toggleFullscreen'),
 				togglePlacement: t('drawer.togglePlacement'),
diff --git a/web/src/ui/sidebar-shell.tsx b/web/src/ui/sidebar-shell.tsx
index 84b23599..8508b80e 100644
--- a/web/src/ui/sidebar-shell.tsx
+++ b/web/src/ui/sidebar-shell.tsx
@@ -11,6 +11,7 @@ type SidebarShellProps = {
 	onToggleFullscreen: () => void;
 	onTogglePlacement: () => void;
 	onClose: () => void;
+	contentClassName?: string;
 	labels: {
 		toggleFullscreen: string;
 		togglePlacement: string;
@@ -26,8 +27,11 @@ export const SidebarShell = ({
 	onToggleFullscreen,
 	onTogglePlacement,
 	onClose,
+	contentClassName = '',
 	labels,
 }: SidebarShellProps) => {
+	const contentClasses = ['ts-sidebar-shell__content', 'ts-scrollbar-thin', contentClassName].filter(Boolean).join(' ');
+
 	return (
 		<Box className="ts-sidebar-shell">
 			<Group justify="space-between" align="center" wrap="nowrap" className="ts-sidebar-shell__header">
@@ -48,7 +52,7 @@ export const SidebarShell = ({
 				</Box>
 			</Group>
 
-			<Box className="ts-sidebar-shell__content ts-scrollbar-thin">{children}</Box>
+			<Box className={contentClasses}>{children}</Box>
 		</Box>
 	);
 };

From edf4443a4ee13851c6605e18d1ae7beb13212cab Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Mon, 27 Apr 2026 23:28:19 +0300
Subject: [PATCH 53/54] docs: rewrite AGENTS for GPT-5.5 guidance

---
 AGENTS.md     | 237 ++++++++++++++++++--------------------------------
 AGENTS.old.md | 197 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 284 insertions(+), 150 deletions(-)
 create mode 100644 AGENTS.old.md

diff --git a/AGENTS.md b/AGENTS.md
index 77076141..fa910096 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,197 +1,134 @@
 # AGENTS.md - TaleSpinner
 
 Repository contract for coding agents working in this repo.
-This file is strict on purpose. Follow it literally.
+Keep this file outcome-first: preserve the project architecture, make the requested change safely, validate what changed, and stop when the user's goal is handled.
 
 ## Project Identity
 - TaleSpinner is a local LLM application for storytelling, roleplay, and multi-agent scenario building.
 - The product is built around isolated profiles, chats and branches, world info, instructions, operation pipelines, and optional RAG flows.
 - The goal is not "one big prompt". The goal is a reproducible, controllable LLM workflow with clean context boundaries.
 
-## Quick Commands
+## Stack And Commands
+- Monorepo: `server` (Node.js + Express + TypeScript), `web` (Vite + React + TypeScript + Effector + Mantine), `docs` (Docusaurus), `shared` (shared contracts and utils), `data` (runtime data).
+- Package manager: Yarn Classic 1.x only. Never switch a task to npm or pnpm.
+- Docs require Node `>=20`.
 - Install app deps: `yarn install:all`
 - Install docs deps: `yarn install:docs`
-- Run backend + frontend: `yarn dev`
+- Run app: `yarn dev`
 - Run docs: `yarn docs:dev`
 - Build app: `yarn build`
 - Build docs: `yarn docs:build`
-- Typecheck backend: `yarn typecheck:server`
-- Typecheck frontend: `yarn typecheck:web`
-- Lint backend: `yarn lint:server`
-- Lint frontend: `yarn lint:web`
-- Run backend tests: `yarn --cwd server test`
-- Verify backend: `yarn verify:server`
-- Verify frontend: `yarn verify:web`
-- Check docs: `yarn docs:check`
-- Regenerate API docs: `yarn docs:generate:api`
-
-## Stack Snapshot
-- Monorepo: `server` (Node.js + Express + TypeScript), `web` (Vite + React + TypeScript + Effector + Mantine), `docs` (Docusaurus), `shared` (shared contracts and utils), `data` (runtime data).
-- Package manager: Yarn Classic 1.x only. NEVER switch a task to npm or pnpm.
-- Runtime note: docs require Node `>=20`.
+- Backend checks: `yarn typecheck:server`, `yarn lint:server`, `yarn --cwd server test`, `yarn build:server`
+- Frontend checks: `yarn typecheck:web`, `yarn lint:web`, `yarn build:web`
+- Higher-level checks: `yarn verify:server`, `yarn verify:web`, `yarn docs:check`, `yarn docs:generate:api`
 
-## Repo Topology
+## Repo Map
 - `server/src/index.ts`: backend entrypoint.
 - `server/src/api/_routes_.ts`: API route registry.
 - `server/src/application/**`: use-cases and application orchestration.
 - `server/src/services/**`: domain services and repositories.
 - `server/src/core/**`: shared backend infrastructure, middleware, gateway, factories, errors, logging.
+- `server/src/core/llm-gateway/**`: LLM provider gateway and adapter layer.
 - `server/src/db/schema/**`: database schema.
 - `web/src/main.tsx` and `web/src/App.tsx`: frontend bootstrap.
-- `web/src/model/**`: Effector business state. This is the default home for frontend domain logic.
+- `web/src/model/**`: default home for frontend business state.
 - `web/src/features/**`: UI features.
 - `web/src/api/**`: frontend API clients.
 - `web/src/ui/**`: shared UI and form primitives.
 - `web/src/i18n/**`: localization setup and RU/EN resources.
-- `shared/**`: source of truth for cross-layer contracts. If backend and frontend share a shape, it belongs here.
+- `shared/**`: source of truth for cross-layer contracts.
 - `docs/docs/**`: RU docs.
 - `docs/i18n/en/docusaurus-plugin-content-docs/current/**`: EN docs.
-- `server/src/legacy/**` and `web/src/legacy/**`: reference only. Do not edit unless the task is explicitly about legacy migration.
-
-## Global Non-Negotiables
-- MUST inspect neighboring code, tests, and docs before changing anything.
-- MUST keep changes tightly scoped to the request. No opportunistic refactors.
-- MUST prefer `rg` and `rg --files` for search when available.
-- MUST preserve existing architecture instead of inventing a parallel one.
-- MUST extract the touched slice before adding more logic to an oversized file.
-- NEVER edit `legacy/**` unless the task explicitly requires it.
-- NEVER expose secrets, token values, encryption keys, cookies, raw auth headers, or env-backed credentials in code, logs, screenshots, tests, or reports.
-- NEVER add comments in Russian inside code. Code comments must stay in English.
-- NEVER keep dead branches, commented-out code, placeholder TODO logic, or "temporary" debug flows in final changes.
-- NEVER solve a structural problem by adding more nesting, more flags, or more copy-pasted branches if extraction is the correct fix.
-
-## Code Size And Readability
-- Production files SHOULD stay at or below `300` lines and MUST NOT exceed `400` lines.
-- Functions SHOULD stay at or below `30` logical lines and MUST NOT exceed `50` lines.
-- React components SHOULD stay at or below `150` lines and MUST NOT exceed `200` lines.
-- A function should do one job. If it coordinates multiple concerns, split it.
-- Names MUST describe domain meaning, not implementation trivia.
-- Prefer explicit types, small helpers, and flat control flow over deeply nested conditions.
-- Exemptions are limited to generated files, translation dictionaries, migrations, fixtures, and exhaustive tests.
-- If a touched file already exceeds the limit, do not keep stacking logic into it. Extract the modified concern into smaller modules in the same task.
-
-## Backend Rules (`server/**`)
-
-### Architecture
-- Routes MUST stay thin.
-- Route files are for HTTP wiring only: parse request, validate input, call the application/service layer, map the response.
-- Business rules MUST live in use-cases or services, not inside Express handlers.
-- Persistence MUST live in repository-style modules, not inside routes or random helpers.
-- LLM provider access MUST go through the existing gateway/adapter layers in `core/llm-gateway` or the established service abstractions. Do not call providers ad hoc from unrelated modules.
-- Shared request/response contracts that matter to both layers MUST live in `shared/**`.
-
-### Validation And Types
-- Validate inputs at the edge with the existing validation patterns (`zod`, `validate`, route schemas).
-- Keep request/response flow typed end to end.
-- Avoid `any`. Use it only when the boundary is truly dynamic and no narrower type is reasonable. If `any` is unavoidable, keep it local and justify it in code.
-- Prefer explicit DTOs and domain types over loose object literals passed through many layers.
-
-### Errors, Logging, And Security
+- `server/src/legacy/**` and `web/src/legacy/**`: reference only. Do not edit unless the task explicitly requires legacy migration.
+
+## Working Rules
+- Before edits, inspect the smallest relevant slice of neighboring implementation, tests, contracts, and docs needed to avoid breaking local patterns.
+- Keep changes scoped to the user's request. Avoid opportunistic refactors and unrelated formatting churn.
+- Prefer `rg` and `rg --files` for search when available.
+- Preserve existing architecture. Add abstractions only when they remove real complexity or match established local patterns.
+- If a touched production file is already oversized, extract the concern you are modifying instead of adding more logic to it.
+- Use explicit domain names, narrow types, small helpers, and flat control flow.
+- Do not leave dead branches, commented-out code, placeholder TODO logic, or temporary debug flows in final changes.
+- Code comments must be in English.
+
+## Size Guidelines
+- Production files should stay near or below 300 lines and must not exceed 400 lines without a strong local reason.
+- Functions should stay near or below 30 logical lines and must not exceed 50 lines.
+- React components should stay near or below 150 lines and must not exceed 200 lines.
+- Generated files, translation dictionaries, migrations, fixtures, and exhaustive tests are exempt.
+
+## Backend
+- Routes are HTTP wiring: parse, validate, call the application/service layer, and map the response.
+- Business rules belong in use-cases or services, not Express handlers.
+- Persistence belongs in repository-style modules.
+- LLM provider access goes through `server/src/core/llm-gateway/**` or established service abstractions.
+- Validate inputs at the edge with existing validation patterns such as `zod`, `validate`, and route schemas.
+- Keep request/response flow typed end to end. Avoid `any`; if a dynamic boundary requires it, keep it local and justified.
 - Use structured error handling. Do not swallow errors.
-- Never use an empty `catch`. If a catch intentionally suppresses an error, document why and keep the fallback explicit.
-- Never log raw request bodies if they may contain tokens, secrets, or untrusted large payloads.
-- Redact sensitive values in logs and error contexts.
-- Keep file access constrained to intended safe paths.
+- Never expose secrets, token values, encryption keys, cookies, raw auth headers, or env-backed credentials in code, logs, screenshots, tests, or reports.
+- Never log raw request bodies that may contain secrets, tokens, or untrusted large payloads.
 - Treat user markdown, HTML, imported cards, templates, and external provider payloads as untrusted input.
 
-### Backend Testing
-- Backend work MUST follow TDD: write the failing test first, make it pass, then refactor.
-- Every backend feature or bug fix MUST add or update tests at the correct level.
-- Pure logic gets unit tests.
-- Service orchestration, repositories, and route contracts get integration or API tests.
-- User-visible backend flows and regression-prone orchestration paths get smoke or e2e coverage when behavior changes.
-
-## Frontend Rules (`web/**`)
-
-### State And Architecture
+## Frontend
 - Effector is the default state layer for app state, business state, async flows, and cross-component coordination.
-- Business logic MUST live in `web/src/model/**`, domain utilities, or clearly scoped feature-model modules.
-- React components MUST stay focused on presentation and local interaction wiring.
-- `useState` is allowed only for leaf-local ephemeral UI state such as a disclosure toggle, a local tab, or a transient modal flag.
-- NEVER lift chains of `useState` up the tree for business state or form state.
-- NEVER put large app state into React component trees when Effector should own it.
-- If state is shared across features, persisted, async-driven, or affects multiple subtrees, it belongs in Effector.
-
-### Effector Rules
-- Use `useUnit` for subscribing to stores and binding events/effects in React.
-- Prefer small, atomic stores over monolithic "god stores".
-- Use declarative flows with `sample`, events, stores, and effects.
-- Keep `.watch` for debug or narrow side-effect bridges only. NEVER build core business logic around `.watch`.
-- NEVER place business rules directly inside React event handlers when they can be expressed as Effector events/effects.
-- NEVER subscribe a large top-level component to broad state if that causes avoidable rerenders of most of the app.
-- When a model file grows beyond the size limits, split by concern: state, effects, derived state, orchestration, adapters.
-
-### Forms And Render Performance
-- Forms MUST use `react-hook-form`.
-- Reuse shared form primitives from `web/src/ui/form-components/**` when they fit the task.
-- NEVER build production forms from chained `useState`, manual value syncing, or parent-driven controlled trees unless there is a proven exceptional reason.
-- Form subscriptions MUST be as narrow as possible. Prefer field-scoped subscriptions and render-conscious composition.
-- Form validation, serialization, and submission mapping should be isolated from presentational layout.
-- Large forms MUST be split into sections and extracted components before they become monoliths.
-
-### UI, UX, And Accessibility
-- Every user-facing UI change MUST be responsive for phone, tablet, and desktop.
-- Design MUST feel production-ready: consistent spacing, readable hierarchy, obvious states, and clear interaction affordances.
-- Do not ship desktop-only layouts, clipped drawers, overflowing modals, or controls that become unusable on smaller screens.
-- Inputs, buttons, icon buttons, menus, tabs, and dialogs MUST have accessible labels and predictable keyboard behavior.
-- Empty, loading, error, and disabled states are required when the feature can reach them.
+- Business logic belongs in `web/src/model/**`, domain utilities, or clearly scoped feature-model modules.
+- React components should stay focused on presentation and local interaction wiring.
+- `useState` is for leaf-local ephemeral UI state such as disclosures, local tabs, and transient modals.
+- Use `useUnit` for subscribing to Effector stores and binding events/effects in React.
+- Prefer declarative Effector flows with `sample`, events, stores, and effects. Keep `.watch` for debug or narrow side-effect bridges.
+- Forms should use `react-hook-form` and shared primitives from `web/src/ui/form-components/**` when they fit.
+- Keep form subscriptions narrow. Isolate validation, serialization, and submission mapping from presentation.
+- User-facing UI changes must be responsive for phone, tablet, and desktop.
+- Inputs, buttons, icon buttons, menus, tabs, and dialogs need accessible labels and predictable keyboard behavior.
+- Include empty, loading, error, and disabled states when the feature can reach them.
 - Avoid unnecessary rerenders in heavy panels, message lists, editors, and forms.
 
-### Localization
-- All user-facing text MUST be localized in both Russian and English.
-- Keep RU and EN resource trees in sync.
-- Do not hardcode UI text in components, stores, helpers, or API mappers, except in tests, internal debug-only output, or truly non-user-facing diagnostics.
-- When adding a new feature, update both locales in the same task.
-
-### Frontend Testing
-- Frontend work MUST follow TDD the same way backend work does.
-- Missing frontend test infrastructure is not a waiver.
-- If a frontend task adds business logic, render-critical behavior, or regression-prone UI flows, the task MUST include adding or using appropriate frontend test coverage.
-- Pure utilities and transforms get unit tests.
-- Complex state transitions, model orchestration, and critical UI behavior get integration-style coverage.
+## Localization
+- All user-facing text belongs in localization resources, not hardcoded in components, stores, helpers, or API mappers.
+- Update Russian and English resources together.
+- Tests, internal debug-only output, and truly non-user-facing diagnostics may use inline text.
 
-## Shared Contracts (`shared/**`)
-- Shared types are the contract between backend and frontend. Treat changes here as public interface changes inside the repo.
+## Shared Contracts
+- Shared request/response shapes that matter to both backend and frontend belong in `shared/**`.
 - Do not duplicate shared shapes in `server` and `web`.
-- Any contract change MUST be validated in both app layers and reflected in docs when externally visible.
+- Treat shared contract changes as public interface changes inside the repo.
+- Validate contract changes in both app layers and update docs when the behavior is externally visible.
 
-## Docs Rules (`docs/**`)
-- Docs are currently outside the default verification scope.
-- Touch docs only when the task explicitly requires docs work.
-- If docs are touched, RU and EN docs must stay structurally aligned.
-- If docs are touched and API surface or shared contract behavior changes, regenerate API docs before docs checks.
-- Do not leave docs knowingly stale when docs are part of the task.
-
-## TDD And Mandatory Verification
-- TDD is mandatory: red -> green -> refactor.
-- "I will add tests later" is not acceptable.
-- After each completed feature, all required tests and checks must be green.
-- Mandatory post-feature full-suite commands:
-  - `yarn typecheck:server`
-  - `yarn lint:server`
-  - `yarn --cwd server test`
-  - `yarn build:server`
-  - `yarn typecheck:web`
-  - `yarn lint:web`
-  - `yarn build:web`
+## Docs
+- Touch docs only when the task explicitly requires docs work or the code change would otherwise leave affected docs knowingly stale.
+- Keep RU and EN docs structurally aligned.
 - If docs are touched and API routes or shared contract surface changed, run `yarn docs:generate:api` before `yarn docs:check`.
 
-## Worktree Startup Rule
+## Testing And Verification
+- For backend/frontend behavior changes, write or update the most relevant failing test first, make it pass, then refactor.
+- Pure logic gets unit tests.
+- Service orchestration, repositories, route contracts, complex state transitions, and regression-prone UI flows get integration-style coverage.
+- For docs-only, config-only, formatting-only, or mechanical changes where tests add no signal, state why targeted tests were not needed.
+- After changes, run the narrowest validation that proves the touched behavior:
+  - targeted tests for changed behavior
+  - type checks or lint checks for affected packages
+  - build checks when packaging, shared contracts, or bundling may be affected
+  - a smoke test when full validation is too expensive
+- Run the full relevant suite before claiming broad readiness, after cross-layer changes, or when the blast radius is unclear.
+- If validation cannot be run, explain why and name the next best check.
+
+## Worktree Startup
 - If the current repo folder name starts with `TaleSpinner_` and is not exactly `TaleSpinner_v1`, treat it as a git worktree.
-- At the start of each new task in such a worktree:
+- At the start of a new task in such a worktree:
   - run `git fetch origin dev`
-  - if the current branch is `dev`, `main`, or detached `HEAD`, create and switch to a task branch from `origin/dev` before edits
+  - if the current branch is `dev`, `main`, or detached `HEAD`, create and switch to a task branch from `origin/dev`
   - run `sync-db-from-main.bat --no-extra --no-pause`
 
 ## Definition Of Done
-- Requested behavior is implemented in the correct layer and consistent with neighboring architecture.
-- Tests are written first and end green.
-- Required full-suite checks are green.
+- The requested behavior is implemented in the correct layer and follows neighboring architecture.
+- Relevant tests and checks pass, or any skipped validation is explicitly justified.
+- Security, file-access, and logging boundaries are preserved.
 - RU/EN localization parity is preserved for user-facing text.
 - RU/EN docs parity is preserved when docs are touched.
-- Final report must include changed files, why the change was made, commands executed, and test/check results.
+- The final report includes changed files, why the change was made, commands executed, and test/check results.
 
-## Instruction Hygiene
-- Keep this file concise, directive, and enforceable.
-- Prefer hard rules over taste-based advice.
-- Add new rules only when they materially improve agent behavior on this repo.
+## Stop Rules
+- Ask a narrow clarification only when missing information would materially change the implementation or create meaningful risk.
+- Stop searching once the core request can be answered or implemented with enough local evidence.
+- Stop editing once the requested behavior and Definition of Done are satisfied.
+- If a required change would violate these rules, report the conflict before proceeding.
diff --git a/AGENTS.old.md b/AGENTS.old.md
new file mode 100644
index 00000000..77076141
--- /dev/null
+++ b/AGENTS.old.md
@@ -0,0 +1,197 @@
+# AGENTS.md - TaleSpinner
+
+Repository contract for coding agents working in this repo.
+This file is strict on purpose. Follow it literally.
+
+## Project Identity
+- TaleSpinner is a local LLM application for storytelling, roleplay, and multi-agent scenario building.
+- The product is built around isolated profiles, chats and branches, world info, instructions, operation pipelines, and optional RAG flows.
+- The goal is not "one big prompt". The goal is a reproducible, controllable LLM workflow with clean context boundaries.
+
+## Quick Commands
+- Install app deps: `yarn install:all`
+- Install docs deps: `yarn install:docs`
+- Run backend + frontend: `yarn dev`
+- Run docs: `yarn docs:dev`
+- Build app: `yarn build`
+- Build docs: `yarn docs:build`
+- Typecheck backend: `yarn typecheck:server`
+- Typecheck frontend: `yarn typecheck:web`
+- Lint backend: `yarn lint:server`
+- Lint frontend: `yarn lint:web`
+- Run backend tests: `yarn --cwd server test`
+- Verify backend: `yarn verify:server`
+- Verify frontend: `yarn verify:web`
+- Check docs: `yarn docs:check`
+- Regenerate API docs: `yarn docs:generate:api`
+
+## Stack Snapshot
+- Monorepo: `server` (Node.js + Express + TypeScript), `web` (Vite + React + TypeScript + Effector + Mantine), `docs` (Docusaurus), `shared` (shared contracts and utils), `data` (runtime data).
+- Package manager: Yarn Classic 1.x only. NEVER switch a task to npm or pnpm.
+- Runtime note: docs require Node `>=20`.
+
+## Repo Topology
+- `server/src/index.ts`: backend entrypoint.
+- `server/src/api/_routes_.ts`: API route registry.
+- `server/src/application/**`: use-cases and application orchestration.
+- `server/src/services/**`: domain services and repositories.
+- `server/src/core/**`: shared backend infrastructure, middleware, gateway, factories, errors, logging.
+- `server/src/db/schema/**`: database schema.
+- `web/src/main.tsx` and `web/src/App.tsx`: frontend bootstrap.
+- `web/src/model/**`: Effector business state. This is the default home for frontend domain logic.
+- `web/src/features/**`: UI features.
+- `web/src/api/**`: frontend API clients.
+- `web/src/ui/**`: shared UI and form primitives.
+- `web/src/i18n/**`: localization setup and RU/EN resources.
+- `shared/**`: source of truth for cross-layer contracts. If backend and frontend share a shape, it belongs here.
+- `docs/docs/**`: RU docs.
+- `docs/i18n/en/docusaurus-plugin-content-docs/current/**`: EN docs.
+- `server/src/legacy/**` and `web/src/legacy/**`: reference only. Do not edit unless the task is explicitly about legacy migration.
+
+## Global Non-Negotiables
+- MUST inspect neighboring code, tests, and docs before changing anything.
+- MUST keep changes tightly scoped to the request. No opportunistic refactors.
+- MUST prefer `rg` and `rg --files` for search when available.
+- MUST preserve existing architecture instead of inventing a parallel one.
+- MUST extract the touched slice before adding more logic to an oversized file.
+- NEVER edit `legacy/**` unless the task explicitly requires it.
+- NEVER expose secrets, token values, encryption keys, cookies, raw auth headers, or env-backed credentials in code, logs, screenshots, tests, or reports.
+- NEVER add comments in Russian inside code. Code comments must stay in English.
+- NEVER keep dead branches, commented-out code, placeholder TODO logic, or "temporary" debug flows in final changes.
+- NEVER solve a structural problem by adding more nesting, more flags, or more copy-pasted branches if extraction is the correct fix.
+
+## Code Size And Readability
+- Production files SHOULD stay at or below `300` lines and MUST NOT exceed `400` lines.
+- Functions SHOULD stay at or below `30` logical lines and MUST NOT exceed `50` lines.
+- React components SHOULD stay at or below `150` lines and MUST NOT exceed `200` lines.
+- A function should do one job. If it coordinates multiple concerns, split it.
+- Names MUST describe domain meaning, not implementation trivia.
+- Prefer explicit types, small helpers, and flat control flow over deeply nested conditions.
+- Exemptions are limited to generated files, translation dictionaries, migrations, fixtures, and exhaustive tests.
+- If a touched file already exceeds the limit, do not keep stacking logic into it. Extract the modified concern into smaller modules in the same task.
+
+## Backend Rules (`server/**`)
+
+### Architecture
+- Routes MUST stay thin.
+- Route files are for HTTP wiring only: parse request, validate input, call the application/service layer, map the response.
+- Business rules MUST live in use-cases or services, not inside Express handlers.
+- Persistence MUST live in repository-style modules, not inside routes or random helpers.
+- LLM provider access MUST go through the existing gateway/adapter layers in `core/llm-gateway` or the established service abstractions. Do not call providers ad hoc from unrelated modules.
+- Shared request/response contracts that matter to both layers MUST live in `shared/**`.
+
+### Validation And Types
+- Validate inputs at the edge with the existing validation patterns (`zod`, `validate`, route schemas).
+- Keep request/response flow typed end to end.
+- Avoid `any`. Use it only when the boundary is truly dynamic and no narrower type is reasonable. If `any` is unavoidable, keep it local and justify it in code.
+- Prefer explicit DTOs and domain types over loose object literals passed through many layers.
+
+### Errors, Logging, And Security
+- Use structured error handling. Do not swallow errors.
+- Never use an empty `catch`. If a catch intentionally suppresses an error, document why and keep the fallback explicit.
+- Never log raw request bodies if they may contain tokens, secrets, or untrusted large payloads.
+- Redact sensitive values in logs and error contexts.
+- Keep file access constrained to intended safe paths.
+- Treat user markdown, HTML, imported cards, templates, and external provider payloads as untrusted input.
+
+### Backend Testing
+- Backend work MUST follow TDD: write the failing test first, make it pass, then refactor.
+- Every backend feature or bug fix MUST add or update tests at the correct level.
+- Pure logic gets unit tests.
+- Service orchestration, repositories, and route contracts get integration or API tests.
+- User-visible backend flows and regression-prone orchestration paths get smoke or e2e coverage when behavior changes.
+
+## Frontend Rules (`web/**`)
+
+### State And Architecture
+- Effector is the default state layer for app state, business state, async flows, and cross-component coordination.
+- Business logic MUST live in `web/src/model/**`, domain utilities, or clearly scoped feature-model modules.
+- React components MUST stay focused on presentation and local interaction wiring.
+- `useState` is allowed only for leaf-local ephemeral UI state such as a disclosure toggle, a local tab, or a transient modal flag.
+- NEVER lift chains of `useState` up the tree for business state or form state.
+- NEVER put large app state into React component trees when Effector should own it.
+- If state is shared across features, persisted, async-driven, or affects multiple subtrees, it belongs in Effector.
+
+### Effector Rules
+- Use `useUnit` for subscribing to stores and binding events/effects in React.
+- Prefer small, atomic stores over monolithic "god stores".
+- Use declarative flows with `sample`, events, stores, and effects.
+- Keep `.watch` for debug or narrow side-effect bridges only. NEVER build core business logic around `.watch`.
+- NEVER place business rules directly inside React event handlers when they can be expressed as Effector events/effects.
+- NEVER subscribe a large top-level component to broad state if that causes avoidable rerenders of most of the app.
+- When a model file grows beyond the size limits, split by concern: state, effects, derived state, orchestration, adapters.
+
+### Forms And Render Performance
+- Forms MUST use `react-hook-form`.
+- Reuse shared form primitives from `web/src/ui/form-components/**` when they fit the task.
+- NEVER build production forms from chained `useState`, manual value syncing, or parent-driven controlled trees unless there is a proven exceptional reason.
+- Form subscriptions MUST be as narrow as possible. Prefer field-scoped subscriptions and render-conscious composition.
+- Form validation, serialization, and submission mapping should be isolated from presentational layout.
+- Large forms MUST be split into sections and extracted components before they become monoliths.
+
+### UI, UX, And Accessibility
+- Every user-facing UI change MUST be responsive for phone, tablet, and desktop.
+- Design MUST feel production-ready: consistent spacing, readable hierarchy, obvious states, and clear interaction affordances.
+- Do not ship desktop-only layouts, clipped drawers, overflowing modals, or controls that become unusable on smaller screens.
+- Inputs, buttons, icon buttons, menus, tabs, and dialogs MUST have accessible labels and predictable keyboard behavior.
+- Empty, loading, error, and disabled states are required when the feature can reach them.
+- Avoid unnecessary rerenders in heavy panels, message lists, editors, and forms.
+
+### Localization
+- All user-facing text MUST be localized in both Russian and English.
+- Keep RU and EN resource trees in sync.
+- Do not hardcode UI text in components, stores, helpers, or API mappers, except in tests, internal debug-only output, or truly non-user-facing diagnostics.
+- When adding a new feature, update both locales in the same task.
+
+### Frontend Testing
+- Frontend work MUST follow TDD the same way backend work does.
+- Missing frontend test infrastructure is not a waiver.
+- If a frontend task adds business logic, render-critical behavior, or regression-prone UI flows, the task MUST include adding or using appropriate frontend test coverage.
+- Pure utilities and transforms get unit tests.
+- Complex state transitions, model orchestration, and critical UI behavior get integration-style coverage.
+
+## Shared Contracts (`shared/**`)
+- Shared types are the contract between backend and frontend. Treat changes here as public interface changes inside the repo.
+- Do not duplicate shared shapes in `server` and `web`.
+- Any contract change MUST be validated in both app layers and reflected in docs when externally visible.
+
+## Docs Rules (`docs/**`)
+- Docs are currently outside the default verification scope.
+- Touch docs only when the task explicitly requires docs work.
+- If docs are touched, RU and EN docs must stay structurally aligned.
+- If docs are touched and API surface or shared contract behavior changes, regenerate API docs before docs checks.
+- Do not leave docs knowingly stale when docs are part of the task.
+
+## TDD And Mandatory Verification
+- TDD is mandatory: red -> green -> refactor.
+- "I will add tests later" is not acceptable.
+- After each completed feature, all required tests and checks must be green.
+- Mandatory post-feature full-suite commands:
+  - `yarn typecheck:server`
+  - `yarn lint:server`
+  - `yarn --cwd server test`
+  - `yarn build:server`
+  - `yarn typecheck:web`
+  - `yarn lint:web`
+  - `yarn build:web`
+- If docs are touched and API routes or shared contract surface changed, run `yarn docs:generate:api` before `yarn docs:check`.
+
+## Worktree Startup Rule
+- If the current repo folder name starts with `TaleSpinner_` and is not exactly `TaleSpinner_v1`, treat it as a git worktree.
+- At the start of each new task in such a worktree:
+  - run `git fetch origin dev`
+  - if the current branch is `dev`, `main`, or detached `HEAD`, create and switch to a task branch from `origin/dev` before edits
+  - run `sync-db-from-main.bat --no-extra --no-pause`
+
+## Definition Of Done
+- Requested behavior is implemented in the correct layer and consistent with neighboring architecture.
+- Tests are written first and end green.
+- Required full-suite checks are green.
+- RU/EN localization parity is preserved for user-facing text.
+- RU/EN docs parity is preserved when docs are touched.
+- Final report must include changed files, why the change was made, commands executed, and test/check results.
+
+## Instruction Hygiene
+- Keep this file concise, directive, and enforceable.
+- Prefer hard rules over taste-based advice.
+- Add new rules only when they materially improve agent behavior on this repo.

From 751ff8662483ef8a9feed1e118a7cc73e1dc91c9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-80A4L2N\\dima2" <dima28rus97@gmail.com>
Date: Mon, 27 Apr 2026 23:41:31 +0300
Subject: [PATCH 54/54] test: silence Vitest output and skip request logging in
 tests

---
 package.json                             |  9 ++++++++-
 server/package.json                      | 12 ++++++------
 server/src/app.ts                        | 12 ++++++++++--
 server/src/e2e/helpers/mock-ai-server.ts |  1 +
 web/package.json                         |  4 ++--
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 3a1ae8d1..7b08bef8 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,13 @@
     "dev:server": "yarn --cwd server dev",
     "dev:web": "yarn --cwd web dev --host ",
     "dev": "run-p dev:server dev:web",
+    "test:server": "yarn --cwd server test",
+    "test:web": "yarn --cwd web test",
+    "test:e2e:smoke": "yarn --cwd server test:e2e:smoke",
+    "test:e2e:full": "yarn --cwd server test:e2e:full",
+    "test:e2e:stability": "yarn --cwd server test:e2e:stability",
+    "test:e2e:blackbox": "yarn --cwd server test:e2e:blackbox",
+    "test": "run-s test:server test:web test:e2e:smoke",
     "build:server": "yarn --cwd server build",
     "build:web": "yarn --cwd web build",
     "build": "run-s build:server build:web",
@@ -35,4 +42,4 @@
   "devDependencies": {
     "npm-run-all": "^4.1.5"
   }
-}
\ No newline at end of file
+}
diff --git a/server/package.json b/server/package.json
index e679bbab..a20c1494 100644
--- a/server/package.json
+++ b/server/package.json
@@ -32,12 +32,12 @@
     "build": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
     "build:watch": "tsc -p tsconfig.json -w",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:e2e:smoke": "vitest run -c vitest.e2e.config.ts src/e2e/smoke/backend.smoke.e2e.spec.ts src/e2e/smoke/blackbox.smoke.e2e.spec.ts",
-    "test:e2e:full": "vitest run -c vitest.e2e.config.ts src/e2e/full-matrix.e2e.spec.ts src/e2e/full-matrix-extra.e2e.spec.ts",
-    "test:e2e:stability": "vitest run -c vitest.e2e.config.ts src/e2e/stability/smoke-repeat.e2e.spec.ts",
-    "test:e2e:blackbox": "vitest run -c vitest.e2e.config.ts src/e2e/smoke/blackbox.smoke.e2e.spec.ts",
+    "test": "node --no-warnings ./node_modules/vitest/vitest.mjs run --silent=passed-only --reporter=dot",
+    "test:watch": "node --no-warnings ./node_modules/vitest/vitest.mjs",
+    "test:e2e:smoke": "node --no-warnings ./node_modules/vitest/vitest.mjs run --silent=passed-only --reporter=dot -c vitest.e2e.config.ts src/e2e/smoke/backend.smoke.e2e.spec.ts",
+    "test:e2e:full": "node --no-warnings ./node_modules/vitest/vitest.mjs run --silent=passed-only --reporter=dot -c vitest.e2e.config.ts src/e2e/full-matrix.e2e.spec.ts src/e2e/full-matrix-extra.e2e.spec.ts",
+    "test:e2e:stability": "node --no-warnings ./node_modules/vitest/vitest.mjs run --silent=passed-only --reporter=dot -c vitest.e2e.config.ts src/e2e/stability/smoke-repeat.e2e.spec.ts",
+    "test:e2e:blackbox": "node --no-warnings ./node_modules/vitest/vitest.mjs run --silent=passed-only --reporter=dot -c vitest.e2e.config.ts src/e2e/smoke/blackbox.smoke.e2e.spec.ts",
     "seed:chat:large": "ts-node -r tsconfig-paths/register src/scripts/seed-large-chat.ts",
     "seed:chat:extreme": "ts-node -r tsconfig-paths/register src/scripts/seed-large-chat.ts --extreme",
     "lint": "eslint . --config eslint.config.mjs",
diff --git a/server/src/app.ts b/server/src/app.ts
index e117a700..bdb01f9f 100644
--- a/server/src/app.ts
+++ b/server/src/app.ts
@@ -20,14 +20,22 @@ export async function bootstrapApp(options: BootstrapAppOptions = {}): Promise<v
   await runBackendBootstrap({ dbPath: options.dbPath, logger: structuredLogger });
 }
 
+function shouldUseRequestLogging(): boolean {
+  return process.env.NODE_ENV !== "test";
+}
+
 export function createApp(): Express {
   const app = express();
 
-  app.use(morgan("dev"));
+  if (shouldUseRequestLogging()) {
+    app.use(morgan("dev"));
+  }
   app.use(cors());
   app.use(express.json({ limit: "10mb" }));
   app.use(requestContextMiddleware);
-  app.use(requestLifecycleLogger);
+  if (shouldUseRequestLogging()) {
+    app.use(requestLifecycleLogger);
+  }
 
   app.use(express.static("public"));
 
diff --git a/server/src/e2e/helpers/mock-ai-server.ts b/server/src/e2e/helpers/mock-ai-server.ts
index 1461dc13..ad3aa6ec 100644
--- a/server/src/e2e/helpers/mock-ai-server.ts
+++ b/server/src/e2e/helpers/mock-ai-server.ts
@@ -84,6 +84,7 @@ async function streamScenario(req: Request, res: Response): Promise<void> {
   const token = getToken(req);
 
   if (scenario === "fallback_token_first_fails_second_succeeds" && token === "tok_fail") {
+    res.setHeader("x-should-retry", "false");
     res.status(500).json({
       error: { message: "first token failed" },
     });
diff --git a/web/package.json b/web/package.json
index 4b5daa10..e5c71d7f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -5,8 +5,8 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "test": "vitest run",
-    "test:watch": "vitest",
+    "test": "node --no-warnings ./node_modules/vitest/vitest.mjs run --silent=passed-only --reporter=dot",
+    "test:watch": "node --no-warnings ./node_modules/vitest/vitest.mjs",
     "typecheck": "tsc -b",
     "build": "tsc -b && vite build",
     "lint": "eslint .",